net: phy: meson-gxl: 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/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index 753ca7276869c2352fed010dd9f968599814f6b4..b49c9b5f495360c1d19964d1e8a60adaa4622e82 100644 (file)
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -124,7 +124,7 @@ static int meson_gxl_phy_config(struct phy_device *phydev)
        return genphy_config(phydev);
 }
 
-static struct phy_driver meson_gxl_phy_driver = {
+U_BOOT_PHY_DRIVER(meson_gxl_phy) = {
        .name = "Meson GXL Internal PHY",
        .uid = 0x01814400,
        .mask = 0xfffffff0,
@@ -133,10 +133,3 @@ static struct phy_driver meson_gxl_phy_driver = {
        .startup = &meson_gxl_startup,
        .shutdown = &genphy_shutdown,
 };
-
-int phy_meson_gxl_init(void)
-{
-       phy_register(&meson_gxl_phy_driver);
-
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 4747011cda296d6be0ebc9067af62f634556593d..27cc9f5ec60fb0848d60507235374807f7b1ef54 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_MESON_GXL
-       phy_meson_gxl_init();
-#endif
 #ifdef CONFIG_PHY_NATSEMI
        phy_natsemi_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index 570524a21f5e2a7d4fcbcb0facad8f8795a8c1e4..f69f379fc2bda29f208dd004f5e68b5971ddab55 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_meson_gxl_init(void);
 int phy_natsemi_init(void);
 int phy_nxp_c45_tja11xx_init(void);
 int phy_nxp_tja11xx_init(void);