net: phy: teranetics: 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/phy.c b/drivers/net/phy/phy.c
index d4a50fb76acefdf5ba6d48afd918757b52073d4c..b76cc51cbfb7f3ce484b27c80624868788b2454b 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_TERANETICS
-       phy_teranetics_init();
-#endif
 #ifdef CONFIG_PHY_TI
        phy_ti_init();
 #endif

diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index c402bad88c6c4d53ff7f601ff0bf7accc9c4d292..15f2c12ed83cde6d55ca6199e96b71b79c42db88 100644 (file)
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -90,7 +90,7 @@ int tn2020_startup(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver tn2020_driver = {
+U_BOOT_PHY_DRIVER(tn2020) = {
        .name = "Teranetics TN2020",
        .uid = PHY_UID_TN2020,
        .mask = 0xfffffff0,
@@ -102,10 +102,3 @@ static struct phy_driver tn2020_driver = {
        .startup = &tn2020_startup,
        .shutdown = &gen10g_shutdown,
 };
-
-int phy_teranetics_init(void)
-{
-       phy_register(&tn2020_driver);
-
-       return 0;
-}

diff --git a/include/phy.h b/include/phy.h
index 4326ef223e02697064e0226ec86ca56a0d1471c6..2c6e167f26e42c0495e956e48b66ea4cb460173c 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_teranetics_init(void);
 int phy_ti_init(void);
 int phy_vitesse_init(void);
 int phy_xilinx_init(void);