net: phy: xilinx: 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/phy.c b/drivers/net/phy/phy.c
index fff1d669fcdc91f29edd1502778b7140e34c57f8..b85d5c4566d19afd7ff9139b544121f307db8c9a 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_XILINX
-       phy_xilinx_init();
-#endif
 #ifdef CONFIG_PHY_XWAY
        phy_xway_init();
 #endif

diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c
index 39dbfdb7da88a739c19663ada648cd9e1683e880..1df639d6f4438f9d7927b2f2f10eb28fc91a7997 100644 (file)
--- a/drivers/net/phy/xilinx_phy.c
+++ b/drivers/net/phy/xilinx_phy.c
@@ -127,7 +127,7 @@ static int xilinxphy_config(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver xilinxphy_driver = {
+U_BOOT_PHY_DRIVER(xilinxphy) = {
        .uid = XILINX_PHY_ID,
        .mask = XILINX_PHY_ID_MASK,
        .name = "Xilinx PCS/PMA PHY",
@@ -136,11 +136,3 @@ static struct phy_driver xilinxphy_driver = {
        .startup = &xilinxphy_startup,
        .shutdown = &genphy_shutdown,
 };
-
-int phy_xilinx_init(void)
-{
-       debug("%s\n", __func__);
-       phy_register(&xilinxphy_driver);
-
-       return 0;
-}

diff --git a/include/phy.h b/include/phy.h
index 74f3ada2491107a2e825a066c3d9ebc7ce17d888..e128ddf00375ca3b2d7d0711beca9cf66d35095e 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_xilinx_init(void);
 int phy_xway_init(void);
 int phy_mscc_init(void);
 int phy_fixed_init(void);