net: phy: xilinx-gmii2rgmii: 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 69db79f79e0392ed45092f2952f2ca4113c736c6..9d5d14946162b34f38f9fec72f9b09ca4dc3352d 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_GMII2RGMII
-       phy_xilinx_gmii2rgmii_init();
-#endif
        genphy_init();
 
        return 0;

diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index 7376283956548b8fa127dd047f717f1504b1e710..0b7436a7e1e9a81d81902f50ba497c18d753c2b1 100644 (file)
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -124,7 +124,7 @@ static int xilinxgmiitorgmii_probe(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver gmii2rgmii_driver = {
+U_BOOT_PHY_DRIVER(gmii2rgmii) = {
        .name = "XILINX GMII2RGMII",
        .uid = PHY_GMII2RGMII_ID,
        .mask = 0xffffffff,
@@ -135,10 +135,3 @@ static struct phy_driver gmii2rgmii_driver = {
        .writeext = xilinxgmiitorgmii_extwrite,
        .readext = xilinxgmiitorgmii_extread,
 };
-
-int phy_xilinx_gmii2rgmii_init(void)
-{
-       phy_register(&gmii2rgmii_driver);
-
-       return 0;
-}

diff --git a/include/phy.h b/include/phy.h
index 001c998db474f5fed70b38b25efe052e93d35e9c..df2586f89ea263fe4274894d8b0bf12601e02c0e 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -315,8 +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_gmii2rgmii_init(void);
-
 /**
  * U_BOOT_PHY_DRIVER() - Declare a new U-Boot driver
  * @__name: name of the driver