From: Marek Vasut Date: Sun, 19 Mar 2023 17:02:53 +0000 (+0100) Subject: net: phy: lxt: Convert to U_BOOT_PHY_DRIVER() X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=f10c8938156ad5efa7da796ce76d6d9b5cd31606;p=u-boot.git net: phy: lxt: 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) --- diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index 2618deb009..20940033a3 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c @@ -58,7 +58,7 @@ static int lxt971_startup(struct phy_device *phydev) return lxt971_parse_status(phydev); } -static struct phy_driver LXT971_driver = { +U_BOOT_PHY_DRIVER(lxt971) = { .name = "LXT971", .uid = 0x1378e0, .mask = 0xfffff0, @@ -67,10 +67,3 @@ static struct phy_driver LXT971_driver = { .startup = &lxt971_startup, .shutdown = &genphy_shutdown, }; - -int phy_lxt_init(void) -{ - phy_register(&LXT971_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 5b6e629437..e2e31773f6 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_LXT - phy_lxt_init(); -#endif #ifdef CONFIG_PHY_MARVELL phy_marvell_init(); #endif diff --git a/include/phy.h b/include/phy.h index 3bc4a0de72..a309056ce7 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_lxt_init(void); int phy_marvell_init(void); int phy_micrel_ksz8xxx_init(void); int phy_micrel_ksz90x1_init(void);