net: phy: et1011c: Convert to U_BOOT_PHY_DRIVER()

Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call.

Converted using sed
"s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {"

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Acked-by: Michal Simek <michal.simek@amd.com>
Tested-by: Michal Simek <michal.simek@amd.com> #microblaze (MANUAL_RELOC)

diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c
index 7eff5ec7cacbee38dc6832944ff06db5b4686d20..fa4831427d50aa498f3919b5c65a261e63540355 100644 (file)
--- a/drivers/net/phy/et1011c.c
+++ b/drivers/net/phy/et1011c.c
@@ -87,7 +87,7 @@ static int et1011c_startup(struct phy_device *phydev)
        return et1011c_parse_status(phydev);
 }
 
-static struct phy_driver et1011c_driver = {
+U_BOOT_PHY_DRIVER(et1011c) = {
        .name           = "ET1011C",
        .uid            = 0x0282f014,
        .mask           = 0xfffffff0,
@@ -95,10 +95,3 @@ static struct phy_driver et1011c_driver = {
        .config         = &et1011c_config,
        .startup        = &et1011c_startup,
 };
-
-int phy_et1011c_init(void)
-{
-       phy_register(&et1011c_driver);
-
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 7312719cdbbed20aa71c992c3ddcb339d2edf805..5b6e6294377074d2a1fb974d88ba2547e5ef9008 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -514,9 +514,6 @@ int phy_init(void)
                phy_drv_reloc(drv);
 #endif
 
-#ifdef CONFIG_PHY_ET1011C
-       phy_et1011c_init();
-#endif
 #ifdef CONFIG_PHY_LXT
        phy_lxt_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index 9e5a9196cbdd47f78a303a5b6e64ab74135a5bf9..3bc4a0de72476443bff8764dbf0715556e148847 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev);
 int gen10g_shutdown(struct phy_device *phydev);
 int gen10g_discover_mmds(struct phy_device *phydev);
 
-int phy_et1011c_init(void);
 int phy_lxt_init(void);
 int phy_marvell_init(void);
 int phy_micrel_ksz8xxx_init(void);