From 1965f2aa65fb6cc98775dec4ac5498eabcd885d3 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 19 Mar 2023 18:03:00 +0100 Subject: net: phy: nxp-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-tja11xx.c | 12 ++---------- drivers/net/phy/phy.c | 3 --- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'drivers/net/phy') diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c index 30dec5e..471b0e3 100644 --- a/drivers/net/phy/nxp-tja11xx.c +++ b/drivers/net/phy/nxp-tja11xx.c @@ -248,7 +248,7 @@ static int tja11xx_startup(struct phy_device *phydev) return 0; } -static struct phy_driver TJA1100_driver = { +U_BOOT_PHY_DRIVER(tja1100) = { .name = "NXP TJA1100", .uid = PHY_ID_TJA1100, .mask = PHY_ID_MASK, @@ -258,7 +258,7 @@ static struct phy_driver TJA1100_driver = { .shutdown = &genphy_shutdown, }; -static struct phy_driver TJA1101_driver = { +U_BOOT_PHY_DRIVER(tja1101) = { .name = "NXP TJA1101", .uid = PHY_ID_TJA1101, .mask = PHY_ID_MASK, @@ -267,11 +267,3 @@ static struct phy_driver TJA1101_driver = { .startup = &tja11xx_startup, .shutdown = &genphy_shutdown, }; - -int phy_nxp_tja11xx_init(void) -{ - phy_register(&TJA1100_driver); - phy_register(&TJA1101_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 706b950..03d221f 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_PHY_NXP_TJA11XX - phy_nxp_tja11xx_init(); -#endif #ifdef CONFIG_PHY_REALTEK phy_realtek_init(); #endif -- cgit v1.1