From 7e9ce5adf6ff14cc051fd9fe11107cd6ce0ba0ef Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 19 Mar 2023 18:02:50 +0100 Subject: [PATCH] net: phy: davicom: 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/davicom.c | 9 +-------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 4666497d44..31ffa1ac7a 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c @@ -69,7 +69,7 @@ static int dm9161_startup(struct phy_device *phydev) return dm9161_parse_status(phydev); } -static struct phy_driver DM9161_driver = { +U_BOOT_PHY_DRIVER(dm9161) = { .name = "Davicom DM9161E", .uid = 0x181b880, .mask = 0xffffff0, @@ -78,10 +78,3 @@ static struct phy_driver DM9161_driver = { .startup = &dm9161_startup, .shutdown = &genphy_shutdown, }; - -int phy_davicom_init(void) -{ - phy_register(&DM9161_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index d595290dd4..6d7e07c25a 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -517,9 +517,6 @@ int phy_init(void) #ifdef CONFIG_MV88E61XX_SWITCH phy_mv88e61xx_init(); #endif -#ifdef CONFIG_PHY_DAVICOM - phy_davicom_init(); -#endif #ifdef CONFIG_PHY_ET1011C phy_et1011c_init(); #endif diff --git a/include/phy.h b/include/phy.h index 797139bf68..51c2ddb7e4 100644 --- a/include/phy.h +++ b/include/phy.h @@ -316,7 +316,6 @@ int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); int phy_mv88e61xx_init(void); -int phy_davicom_init(void); int phy_et1011c_init(void); int phy_lxt_init(void); int phy_marvell_init(void); -- 2.39.5