net: phy: ncsi: 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>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
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/ncsi.c b/drivers/net/phy/ncsi.c
index bb7ecebed382a1ad6ad4ee84a07c30d5515fd3ff..eb3fd65bb47f48866ddbfd98ce945f83347303ec 100644 (file)
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -881,7 +881,7 @@ int ncsi_shutdown(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver ncsi_driver = {
+U_BOOT_PHY_DRIVER(ncsi) = {
        .uid            = PHY_NCSI_ID,
        .mask           = 0xffffffff,
        .name           = "NC-SI",
@@ -891,9 +891,3 @@ static struct phy_driver ncsi_driver = {
        .startup        = ncsi_startup,
        .shutdown       = ncsi_shutdown,
 };
-
-int phy_ncsi_init(void)
-{
-       phy_register(&ncsi_driver);
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 245357c31dc53343a7c0f7b108d63b579aed44c1..69db79f79e0392ed45092f2952f2ca4113c736c6 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_NCSI
-       phy_ncsi_init();
-#endif
 #ifdef CONFIG_PHY_XILINX_GMII2RGMII
        phy_xilinx_gmii2rgmii_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index 9cabfeedec896d14f70ecbacb8d93e91d51335a4..001c998db474f5fed70b38b25efe052e93d35e9c 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_ncsi_init(void);
 int phy_xilinx_gmii2rgmii_init(void);
 
 /**