net: phy: natsemi: 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/natsemi.c b/drivers/net/phy/natsemi.c
index efde4574deb8c6020ed2586c9aac0a4fa0186d8e..6b9e99ea11566f000d1f33f587bbc00284b02c9c 100644 (file)
--- a/drivers/net/phy/natsemi.c
+++ b/drivers/net/phy/natsemi.c
@@ -33,7 +33,7 @@ static int dp83630_config(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver DP83630_driver = {
+U_BOOT_PHY_DRIVER(dp83630) = {
        .name = "NatSemi DP83630",
        .uid = 0x20005ce1,
        .mask = 0xfffffff0,
@@ -103,7 +103,7 @@ static int dp83865_startup(struct phy_device *phydev)
 }
 
 
-static struct phy_driver DP83865_driver = {
+U_BOOT_PHY_DRIVER(dp83865) = {
        .name = "NatSemi DP83865",
        .uid = 0x20005c70,
        .mask = 0xfffffff0,
@@ -146,7 +146,7 @@ static int dp83848_startup(struct phy_device *phydev)
        return dp83848_parse_status(phydev);
 }
 
-static struct phy_driver DP83848_driver = {
+U_BOOT_PHY_DRIVER(dp83848) = {
        .name = "NatSemi DP83848",
        .uid = 0x20005c90,
        .mask = 0x2000ff90,
@@ -155,12 +155,3 @@ static struct phy_driver DP83848_driver = {
        .startup = &dp83848_startup,
        .shutdown = &genphy_shutdown,
 };
-
-int phy_natsemi_init(void)
-{
-       phy_register(&DP83630_driver);
-       phy_register(&DP83865_driver);
-       phy_register(&DP83848_driver);
-
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 27cc9f5ec60fb0848d60507235374807f7b1ef54..3d6fc8080e52ba940c5392d3af486aa89c50cdf7 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_NATSEMI
-       phy_natsemi_init();
-#endif
 #ifdef CONFIG_NXP_C45_TJA11XX_PHY
        phy_nxp_c45_tja11xx_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index f69f379fc2bda29f208dd004f5e68b5971ddab55..647d23595d1bf31a579258a6d3a6f0b06b161b15 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_natsemi_init(void);
 int phy_nxp_c45_tja11xx_init(void);
 int phy_nxp_tja11xx_init(void);
 int phy_realtek_init(void);