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 <marek.vasut+rene...@mailbox.org> --- Cc: "Ariel D'Alessandro" <ariel.dalessan...@collabora.com> Cc: "Cédric Le Goater" <c...@kaod.org> Cc: "Marek Behún" <ka...@kernel.org> Cc: Alex Nemirovsky <alex.nemirov...@cortina-access.com> Cc: Haolin Li <li.hao...@qq.com> Cc: Heinrich Schuchardt <xypron.g...@gmx.de> Cc: Joe Hershberger <joe.hershber...@ni.com> Cc: Joel Stanley <j...@jms.id.au> Cc: Josua Mayer <jo...@solid-run.com> Cc: Marek Vasut <marek.vasut+rene...@mailbox.org> Cc: Michael Trimarchi <mich...@amarulasolutions.com> Cc: Michal Simek <michal.si...@amd.com> Cc: Nate Drude <nat...@variscite.com> Cc: Neil Armstrong <neil.armstr...@linaro.org> Cc: Radu Pirea <radu-nicolae.pi...@oss.nxp.com> Cc: Ramon Fried <rfried....@gmail.com> Cc: Samuel Mendoza-Jonas <s...@mendozajonas.com> Cc: Stefan Roese <s...@denx.de> Cc: T Karthik Reddy <t.karthik.re...@xilinx.com> Cc: Tim Harvey <thar...@gateworks.com> Cc: Vladimir Oltean <vladimir.olt...@nxp.com> Cc: u-boot-amlo...@groups.io --- drivers/net/phy/phy.c | 3 --- drivers/net/phy/xilinx_phy.c | 10 +--------- include/phy.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index fff1d669fcd..b85d5c4566d 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_XILINX - phy_xilinx_init(); -#endif #ifdef CONFIG_PHY_XWAY phy_xway_init(); #endif diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c index 39dbfdb7da8..1df639d6f44 100644 --- a/drivers/net/phy/xilinx_phy.c +++ b/drivers/net/phy/xilinx_phy.c @@ -127,7 +127,7 @@ static int xilinxphy_config(struct phy_device *phydev) return 0; } -static struct phy_driver xilinxphy_driver = { +U_BOOT_PHY_DRIVER(xilinxphy) = { .uid = XILINX_PHY_ID, .mask = XILINX_PHY_ID_MASK, .name = "Xilinx PCS/PMA PHY", @@ -136,11 +136,3 @@ static struct phy_driver xilinxphy_driver = { .startup = &xilinxphy_startup, .shutdown = &genphy_shutdown, }; - -int phy_xilinx_init(void) -{ - debug("%s\n", __func__); - phy_register(&xilinxphy_driver); - - return 0; -} diff --git a/include/phy.h b/include/phy.h index 74f3ada2491..e128ddf0037 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_xilinx_init(void); int phy_xway_init(void); int phy_mscc_init(void); int phy_fixed_init(void); -- 2.39.2