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/phy.c | 3 --- drivers/net/phy/smsc.c | 24 ++++++------------------ include/phy.h | 1 - 3 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index e821a3f37cb..d4a50fb76ac 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_SMSC - phy_smsc_init(); -#endif #ifdef CONFIG_PHY_TERANETICS phy_teranetics_init(); #endif diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 7740a2510d2..056b607e0b8 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -43,7 +43,7 @@ static int smsc_startup(struct phy_device *phydev) return smsc_parse_status(phydev); }
-static struct phy_driver lan8700_driver = { +U_BOOT_PHY_DRIVER(lan8700) = { .name = "SMSC LAN8700", .uid = 0x0007c0c0, .mask = 0xffff0, @@ -53,7 +53,7 @@ static struct phy_driver lan8700_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver lan911x_driver = { +U_BOOT_PHY_DRIVER(lan911x) = { .name = "SMSC LAN911x Internal PHY", .uid = 0x0007c0d0, .mask = 0xffff0, @@ -63,7 +63,7 @@ static struct phy_driver lan911x_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver lan8710_driver = { +U_BOOT_PHY_DRIVER(lan8710) = { .name = "SMSC LAN8710/LAN8720", .uid = 0x0007c0f0, .mask = 0xffff0, @@ -73,7 +73,7 @@ static struct phy_driver lan8710_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver lan8740_driver = { +U_BOOT_PHY_DRIVER(lan8740) = { .name = "SMSC LAN8740", .uid = 0x0007c110, .mask = 0xffff0, @@ -83,7 +83,7 @@ static struct phy_driver lan8740_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver lan8741_driver = { +U_BOOT_PHY_DRIVER(lan8741) = { .name = "SMSC LAN8741", .uid = 0x0007c120, .mask = 0xffff0, @@ -93,7 +93,7 @@ static struct phy_driver lan8741_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver lan8742_driver = { +U_BOOT_PHY_DRIVER(lan8742) = { .name = "SMSC LAN8742", .uid = 0x0007c130, .mask = 0xffff0, @@ -102,15 +102,3 @@ static struct phy_driver lan8742_driver = { .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; - -int phy_smsc_init(void) -{ - phy_register(&lan8710_driver); - phy_register(&lan911x_driver); - phy_register(&lan8700_driver); - phy_register(&lan8740_driver); - phy_register(&lan8741_driver); - phy_register(&lan8742_driver); - - return 0; -} diff --git a/include/phy.h b/include/phy.h index 24a880ed2fb..4326ef223e0 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_smsc_init(void); int phy_teranetics_init(void); int phy_ti_init(void); int phy_vitesse_init(void);