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+renesas@mailbox.org --- Cc: "Ariel D'Alessandro" ariel.dalessandro@collabora.com Cc: "Cédric Le Goater" clg@kaod.org Cc: "Marek Behún" kabel@kernel.org Cc: Alex Nemirovsky alex.nemirovsky@cortina-access.com Cc: Haolin Li li.haolin@qq.com Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Joe Hershberger joe.hershberger@ni.com Cc: Joel Stanley joel@jms.id.au Cc: Josua Mayer josua@solid-run.com Cc: Marek Vasut marek.vasut+renesas@mailbox.org Cc: Michael Trimarchi michael@amarulasolutions.com Cc: Michal Simek michal.simek@amd.com Cc: Nate Drude nate.d@variscite.com Cc: Neil Armstrong neil.armstrong@linaro.org Cc: Radu Pirea radu-nicolae.pirea@oss.nxp.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Samuel Mendoza-Jonas sam@mendozajonas.com Cc: Stefan Roese sr@denx.de Cc: T Karthik Reddy t.karthik.reddy@xilinx.com Cc: Tim Harvey tharvey@gateworks.com Cc: Vladimir Oltean vladimir.oltean@nxp.com Cc: u-boot-amlogic@groups.io --- drivers/net/phy/mv88e61xx.c | 15 +++------------ drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c index 7ab60164c77..85778106edd 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -1127,7 +1127,7 @@ static int mv88e61xx_phy_startup(struct phy_device *phydev) return 0; }
-static struct phy_driver mv88e61xx_driver = { +U_BOOT_PHY_DRIVER(mv88e61xx) = { .name = "Marvell MV88E61xx", .uid = 0x01410eb1, .mask = 0xfffffff0, @@ -1138,7 +1138,7 @@ static struct phy_driver mv88e61xx_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver mv88e609x_driver = { +U_BOOT_PHY_DRIVER(mv88e609x) = { .name = "Marvell MV88E609x", .uid = 0x1410c89, .mask = 0xfffffff0, @@ -1149,7 +1149,7 @@ static struct phy_driver mv88e609x_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver mv88e6071_driver = { +U_BOOT_PHY_DRIVER(mv88e6071) = { .name = "Marvell MV88E6071", .uid = 0x1410db0, .mask = 0xfffffff0, @@ -1160,15 +1160,6 @@ static struct phy_driver mv88e6071_driver = { .shutdown = &genphy_shutdown, };
-int phy_mv88e61xx_init(void) -{ - phy_register(&mv88e61xx_driver); - phy_register(&mv88e609x_driver); - phy_register(&mv88e6071_driver); - - return 0; -} - /* * Overload weak get_phy_id definition since we need non-standard functions * to read PHY registers diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 6d7e07c25a5..7312719cdbb 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_MV88E61XX_SWITCH - phy_mv88e61xx_init(); -#endif #ifdef CONFIG_PHY_ET1011C phy_et1011c_init(); #endif diff --git a/include/phy.h b/include/phy.h index 51c2ddb7e4e..9e5a9196cbd 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_mv88e61xx_init(void); int phy_et1011c_init(void); int phy_lxt_init(void); int phy_marvell_init(void);