net: phy: ksz90x1: 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/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index 79ebdb5e82a07a396f1668fe4548db4dfa072255..ffc3c987eaae0dbccacd20c139fa3288a9d0cb74 100644 (file)
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -270,7 +270,7 @@ static int ksz9021_config(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver ksz9021_driver = {
+U_BOOT_PHY_DRIVER(ksz9021) = {
        .name = "Micrel ksz9021",
        .uid  = 0x221610,
        .mask = 0xfffffe,
@@ -368,7 +368,7 @@ static int ksz9031_config(struct phy_device *phydev)
        return genphy_config(phydev);
 }
 
-static struct phy_driver ksz9031_driver = {
+U_BOOT_PHY_DRIVER(ksz9031) = {
        .name = "Micrel ksz9031",
        .uid  = PHY_ID_KSZ9031,
        .mask = MII_KSZ9x31_SILICON_REV_MASK,
@@ -477,7 +477,7 @@ static int ksz9131_config(struct phy_device *phydev)
        return genphy_config(phydev);
 }
 
-static struct phy_driver ksz9131_driver = {
+U_BOOT_PHY_DRIVER(ksz9131) = {
        .name = "Micrel ksz9131",
        .uid  = PHY_ID_KSZ9131,
        .mask = MII_KSZ9x31_SILICON_REV_MASK,
@@ -497,11 +497,3 @@ int ksz9xx1_phy_get_id(struct phy_device *phydev)
 
        return phyid;
 }
-
-int phy_micrel_ksz90x1_init(void)
-{
-       phy_register(&ksz9021_driver);
-       phy_register(&ksz9031_driver);
-       phy_register(&ksz9131_driver);
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index b2b2d6edfa795c8d5d4df506c7393c3b54ade678..4747011cda296d6be0ebc9067af62f634556593d 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_MICREL_KSZ90X1
-       phy_micrel_ksz90x1_init();
-#endif
 #ifdef CONFIG_PHY_MESON_GXL
        phy_meson_gxl_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index 27d9742c6c4c55f7a586d016aa3686b9c8852037..570524a21f5e2a7d4fcbcb0facad8f8795a8c1e4 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_micrel_ksz90x1_init(void);
 int phy_meson_gxl_init(void);
 int phy_natsemi_init(void);
 int phy_nxp_c45_tja11xx_init(void);