net: phy: davicom: 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/davicom.c b/drivers/net/phy/davicom.c
index 4666497d44f324ce0197918995276db6de83b7be..31ffa1ac7a98df6b60dc049a147316e6e1cc564a 100644 (file)
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -69,7 +69,7 @@ static int dm9161_startup(struct phy_device *phydev)
        return dm9161_parse_status(phydev);
 }
 
-static struct phy_driver DM9161_driver = {
+U_BOOT_PHY_DRIVER(dm9161) = {
        .name = "Davicom DM9161E",
        .uid = 0x181b880,
        .mask = 0xffffff0,
@@ -78,10 +78,3 @@ static struct phy_driver DM9161_driver = {
        .startup = &dm9161_startup,
        .shutdown = &genphy_shutdown,
 };
-
-int phy_davicom_init(void)
-{
-       phy_register(&DM9161_driver);
-
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index d595290dd4bb614130ffeed59494fdeefcfda7ca..6d7e07c25a576611a191629294657e083668f306 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -517,9 +517,6 @@ int phy_init(void)
 #ifdef CONFIG_MV88E61XX_SWITCH
        phy_mv88e61xx_init();
 #endif
-#ifdef CONFIG_PHY_DAVICOM
-       phy_davicom_init();
-#endif
 #ifdef CONFIG_PHY_ET1011C
        phy_et1011c_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index 797139bf6812102a1360a9c2b68237f3cb254cb0..51c2ddb7e4efb70a34c715e9328f71a42d01142d 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -316,7 +316,6 @@ int gen10g_shutdown(struct phy_device *phydev);
 int gen10g_discover_mmds(struct phy_device *phydev);
 
 int phy_mv88e61xx_init(void);
-int phy_davicom_init(void);
 int phy_et1011c_init(void);
 int phy_lxt_init(void);
 int phy_marvell_init(void);