net: phy: atheros: 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/atheros.c b/drivers/net/phy/atheros.c
index c6f9f916459bdea1fc421bd59b0338098a4ac821..abb7bdf537cfa1e7405be003adba47715aab4240 100644 (file)
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -333,7 +333,7 @@ static int ar803x_config(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver AR8021_driver =  {
+U_BOOT_PHY_DRIVER(AR8021) = {
        .name = "AR8021",
        .uid = AR8021_PHY_ID,
        .mask = 0xfffffff0,
@@ -343,7 +343,7 @@ static struct phy_driver AR8021_driver =  {
        .shutdown = genphy_shutdown,
 };
 
-static struct phy_driver AR8031_driver =  {
+U_BOOT_PHY_DRIVER(AR8031) = {
        .name = "AR8031/AR8033",
        .uid = AR8031_PHY_ID,
        .mask = 0xffffffef,
@@ -353,7 +353,7 @@ static struct phy_driver AR8031_driver =  {
        .shutdown = genphy_shutdown,
 };
 
-static struct phy_driver AR8035_driver =  {
+U_BOOT_PHY_DRIVER(AR8035) = {
        .name = "AR8035",
        .uid = AR8035_PHY_ID,
        .mask = 0xffffffef,
@@ -362,12 +362,3 @@ static struct phy_driver AR8035_driver =  {
        .startup = genphy_startup,
        .shutdown = genphy_shutdown,
 };
-
-int phy_atheros_init(void)
-{
-       phy_register(&AR8021_driver);
-       phy_register(&AR8031_driver);
-       phy_register(&AR8035_driver);
-
-       return 0;
-}

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 4f17f98876e968408c2889913bdd61cc61251c72..853302cf97456e23ff2733c2bead957fb1a5df0e 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -520,9 +520,6 @@ int phy_init(void)
 #ifdef CONFIG_MV88E61XX_SWITCH
        phy_mv88e61xx_init();
 #endif
-#ifdef CONFIG_PHY_ATHEROS
-       phy_atheros_init();
-#endif
 #ifdef CONFIG_PHY_BROADCOM
        phy_broadcom_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index a0060cd19ea32ee0532914e4b24667eb168a7dd2..a1be1fbe1a1d79b7b918b1a973232b834584a9c5 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -317,7 +317,6 @@ int gen10g_discover_mmds(struct phy_device *phydev);
 
 int phy_b53_init(void);
 int phy_mv88e61xx_init(void);
-int phy_atheros_init(void);
 int phy_broadcom_init(void);
 int phy_cortina_init(void);
 int phy_cortina_access_init(void);