net: phy: realtek: 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/phy.c b/drivers/net/phy/phy.c
index 03d221f216d64c9e7068ab1d172540b59421efc8..e821a3f37cb8cba5acfd30ef56f847280d0cf406 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_REALTEK
-       phy_realtek_init();
-#endif
 #ifdef CONFIG_PHY_SMSC
        phy_smsc_init();
 #endif

diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 24c3ea59bbb0ee9086e2401ac07dadfd1182fe53..247d9753a88dad79c5c7891c3b7bb66c0fe10e18 100644 (file)
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -409,7 +409,7 @@ static int rtl8211f_startup(struct phy_device *phydev)
 }
 
 /* Support for RTL8211B PHY */
-static struct phy_driver RTL8211B_driver = {
+U_BOOT_PHY_DRIVER(rtl8211b) = {
        .name = "RealTek RTL8211B",
        .uid = 0x1cc912,
        .mask = 0xffffff,
@@ -421,7 +421,7 @@ static struct phy_driver RTL8211B_driver = {
 };
 
 /* Support for RTL8211E-VB-CG, RTL8211E-VL-CG and RTL8211EG-VB-CG PHYs */
-static struct phy_driver RTL8211E_driver = {
+U_BOOT_PHY_DRIVER(rtl8211e) = {
        .name = "RealTek RTL8211E",
        .uid = 0x1cc915,
        .mask = 0xffffff,
@@ -433,7 +433,7 @@ static struct phy_driver RTL8211E_driver = {
 };
 
 /* Support for RTL8211DN PHY */
-static struct phy_driver RTL8211DN_driver = {
+U_BOOT_PHY_DRIVER(rtl8211dn) = {
        .name = "RealTek RTL8211DN",
        .uid = 0x1cc914,
        .mask = 0xffffff,
@@ -444,7 +444,7 @@ static struct phy_driver RTL8211DN_driver = {
 };
 
 /* Support for RTL8211F PHY */
-static struct phy_driver RTL8211F_driver = {
+U_BOOT_PHY_DRIVER(rtl8211f) = {
        .name = "RealTek RTL8211F",
        .uid = 0x1cc916,
        .mask = 0xffffff,
@@ -458,7 +458,7 @@ static struct phy_driver RTL8211F_driver = {
 };
 
 /* Support for RTL8201F PHY */
-static struct phy_driver RTL8201F_driver = {
+U_BOOT_PHY_DRIVER(rtl8201f) = {
        .name = "RealTek RTL8201F 10/100Mbps Ethernet",
        .uid = 0x1cc816,
        .mask = 0xffffff,
@@ -468,14 +468,3 @@ static struct phy_driver RTL8201F_driver = {
        .startup = &rtl8211e_startup,
        .shutdown = &genphy_shutdown,
 };
-
-int phy_realtek_init(void)
-{
-       phy_register(&RTL8211B_driver);
-       phy_register(&RTL8211E_driver);
-       phy_register(&RTL8211F_driver);
-       phy_register(&RTL8211DN_driver);
-       phy_register(&RTL8201F_driver);
-
-       return 0;
-}

diff --git a/include/phy.h b/include/phy.h
index bc42a522ea680170db8ad47815f5144c741df947..24a880ed2fb71ef512942fc069c3ece4aeedace2 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_realtek_init(void);
 int phy_smsc_init(void);
 int phy_teranetics_init(void);
 int phy_ti_init(void);