From d1296d44de5d5c4c6c41a64310dcdb4bd80d6a2a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 19 Mar 2023 18:02:59 +0100 Subject: [PATCH] net: phy: nxp-c45-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 Acked-by: Michal Simek Tested-by: Michal Simek #microblaze (MANUAL_RELOC) --- drivers/net/phy/nxp-c45-tja11xx.c | 8 +------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c index a0f41fab69..f701790194 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -330,7 +330,7 @@ static int nxp_c45_probe(struct phy_device *phydev) return 0; } -static struct phy_driver nxp_c45_tja11xx = { +U_BOOT_PHY_DRIVER(nxp_c45_tja11xx) = { .name = "NXP C45 TJA1103", .uid = PHY_ID_TJA_1103, .mask = 0xfffff0, @@ -340,9 +340,3 @@ static struct phy_driver nxp_c45_tja11xx = { .startup = &nxp_c45_startup, .shutdown = &genphy_shutdown, }; - -int phy_nxp_c45_tja11xx_init(void) -{ - phy_register(&nxp_c45_tja11xx); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 3d6fc8080e..706b9505d6 100644 --- 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_NXP_C45_TJA11XX_PHY - phy_nxp_c45_tja11xx_init(); -#endif #ifdef CONFIG_PHY_NXP_TJA11XX phy_nxp_tja11xx_init(); #endif diff --git a/include/phy.h b/include/phy.h index 647d23595d..aa65ae16f6 100644 --- 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_c45_tja11xx_init(void); int phy_nxp_tja11xx_init(void); int phy_realtek_init(void); int phy_smsc_init(void); -- 2.39.5