net: phy: nxp-tja11xx: 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/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
index 30dec5e605bd1d9d9eb6e07a3618ea82068f1250..471b0e322b58c70759635cbed2d0f909805ed3c0 100644 (file)
--- a/drivers/net/phy/nxp-tja11xx.c
+++ b/drivers/net/phy/nxp-tja11xx.c
@@ -248,7 +248,7 @@ static int tja11xx_startup(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver TJA1100_driver = {
+U_BOOT_PHY_DRIVER(tja1100) = {
        .name = "NXP TJA1100",
        .uid = PHY_ID_TJA1100,
        .mask = PHY_ID_MASK,
@@ -258,7 +258,7 @@ static struct phy_driver TJA1100_driver = {
        .shutdown = &genphy_shutdown,
 };
 
-static struct phy_driver TJA1101_driver = {
+U_BOOT_PHY_DRIVER(tja1101) = {
        .name = "NXP TJA1101",
        .uid = PHY_ID_TJA1101,
        .mask = PHY_ID_MASK,
@@ -267,11 +267,3 @@ static struct phy_driver TJA1101_driver = {
        .startup = &tja11xx_startup,
        .shutdown = &genphy_shutdown,
 };
-
-int phy_nxp_tja11xx_init(void)
-{
-       phy_register(&TJA1100_driver);
-       phy_register(&TJA1101_driver);
-
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 706b9505d6e55856b39dc11017ba8c68b7c2bbb1..03d221f216d64c9e7068ab1d172540b59421efc8 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_NXP_TJA11XX
-       phy_nxp_tja11xx_init();
-#endif
 #ifdef CONFIG_PHY_REALTEK
        phy_realtek_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index aa65ae16f6877d5eeb29a583bae612d7358b932c..bc42a522ea680170db8ad47815f5144c741df947 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_nxp_tja11xx_init(void);
 int phy_realtek_init(void);
 int phy_smsc_init(void);
 int phy_teranetics_init(void);