net: phy: broadcom: 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/broadcom.c b/drivers/net/phy/broadcom.c
index 566fcb8de73b15f69fa7b1b25ec3b916ebecbb1b..ea98cfcc1b598820c0ab11831a534acf8ea31073 100644 (file)
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -323,7 +323,7 @@ static int bcm5482_startup(struct phy_device *phydev)
        return bcm54xx_parse_status(phydev);
 }
 
-static struct phy_driver BCM5461S_driver = {
+U_BOOT_PHY_DRIVER(bcm5461s) = {
        .name = "Broadcom BCM5461S",
        .uid = 0x2060c0,
        .mask = 0xfffff0,
@@ -333,7 +333,7 @@ static struct phy_driver BCM5461S_driver = {
        .shutdown = &genphy_shutdown,
 };
 
-static struct phy_driver BCM5464S_driver = {
+U_BOOT_PHY_DRIVER(bcm5464s) = {
        .name = "Broadcom BCM5464S",
        .uid = 0x2060b0,
        .mask = 0xfffff0,
@@ -343,7 +343,7 @@ static struct phy_driver BCM5464S_driver = {
        .shutdown = &genphy_shutdown,
 };
 
-static struct phy_driver BCM5482S_driver = {
+U_BOOT_PHY_DRIVER(bcm5482s) = {
        .name = "Broadcom BCM5482S",
        .uid = 0x143bcb0,
        .mask = 0xffffff0,
@@ -353,7 +353,7 @@ static struct phy_driver BCM5482S_driver = {
        .shutdown = &genphy_shutdown,
 };
 
-static struct phy_driver BCM_CYGNUS_driver = {
+U_BOOT_PHY_DRIVER(bcm_cygnus) = {
        .name = "Broadcom CYGNUS GPHY",
        .uid = 0xae025200,
        .mask = 0xfffff0,
@@ -362,13 +362,3 @@ static struct phy_driver BCM_CYGNUS_driver = {
        .startup = &bcm_cygnus_startup,
        .shutdown = &genphy_shutdown,
 };
-
-int phy_broadcom_init(void)
-{
-       phy_register(&BCM5482S_driver);
-       phy_register(&BCM5464S_driver);
-       phy_register(&BCM5461S_driver);
-       phy_register(&BCM_CYGNUS_driver);
-
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 7a7762377b626a3a05c87413183ef7f02a45e6c5..4b1fed1ff6f53973fa75e54729b317dfe8e3c6a7 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -517,9 +517,6 @@ int phy_init(void)
 #ifdef CONFIG_MV88E61XX_SWITCH
        phy_mv88e61xx_init();
 #endif
-#ifdef CONFIG_PHY_BROADCOM
-       phy_broadcom_init();
-#endif
 #ifdef CONFIG_PHY_CORTINA
        phy_cortina_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index 88c9013f1f895fce7e785dbba3f7dc38db7be50f..cecfbe6968fe5242fcf03c3d015e69068277a834 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -316,7 +316,6 @@ int gen10g_shutdown(struct phy_device *phydev);
 int gen10g_discover_mmds(struct phy_device *phydev);
 
 int phy_mv88e61xx_init(void);
-int phy_broadcom_init(void);
 int phy_cortina_init(void);
 int phy_cortina_access_init(void);
 int phy_davicom_init(void);