From fba31ab92c16f1757395b424b774e17c8c47aa97 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 19 Mar 2023 18:02:45 +0100 Subject: [PATCH] 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 Acked-by: Michal Simek Tested-by: Michal Simek #microblaze (MANUAL_RELOC) --- drivers/net/phy/atheros.c | 15 +++------------ drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c index c6f9f91..abb7bdf 100644 --- 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 4f17f98..853302c 100644 --- 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 a0060cd..a1be1fb 100644 --- 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); -- 2.7.4