From: Marek Vasut Date: Sun, 19 Mar 2023 17:02:57 +0000 (+0100) Subject: net: phy: meson-gxl: Convert to U_BOOT_PHY_DRIVER() X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=3b96dc7513c4c309fc74165d4de562e4bcd73467;p=u-boot.git net: phy: meson-gxl: 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/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 753ca72768..b49c9b5f49 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -124,7 +124,7 @@ static int meson_gxl_phy_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver meson_gxl_phy_driver = { +U_BOOT_PHY_DRIVER(meson_gxl_phy) = { .name = "Meson GXL Internal PHY", .uid = 0x01814400, .mask = 0xfffffff0, @@ -133,10 +133,3 @@ static struct phy_driver meson_gxl_phy_driver = { .startup = &meson_gxl_startup, .shutdown = &genphy_shutdown, }; - -int phy_meson_gxl_init(void) -{ - phy_register(&meson_gxl_phy_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 4747011cda..27cc9f5ec6 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_MESON_GXL - phy_meson_gxl_init(); -#endif #ifdef CONFIG_PHY_NATSEMI phy_natsemi_init(); #endif diff --git a/include/phy.h b/include/phy.h index 570524a21f..f69f379fc2 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_meson_gxl_init(void); int phy_natsemi_init(void); int phy_nxp_c45_tja11xx_init(void); int phy_nxp_tja11xx_init(void);