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/micrel_ksz8xxx.c | 29 ++++++++--------------------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/drivers/net/phy/micrel_ksz8xxx.c b/drivers/net/phy/micrel_ksz8xxx.c index 60d42fe9840..b0f3abcb037 100644 --- a/drivers/net/phy/micrel_ksz8xxx.c +++ b/drivers/net/phy/micrel_ksz8xxx.c @@ -14,7 +14,7 @@ #include <phy.h> #include <linux/bitops.h> -static struct phy_driver KSZ804_driver = { +U_BOOT_PHY_DRIVER(ksz804) = { .name = "Micrel KSZ804", .uid = 0x221510, .mask = 0xfffff0, @@ -44,7 +44,7 @@ static int ksz_genconfig_bcastoff(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver KSZ8031_driver = { +U_BOOT_PHY_DRIVER(ksz8031) = { .name = "Micrel KSZ8021/KSZ8031", .uid = 0x221550, .mask = 0xfffff0, @@ -72,7 +72,7 @@ static int ksz8051_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver KSZ8051_driver = { +U_BOOT_PHY_DRIVER(ksz8051) = { .name = "Micrel KSZ8051", .uid = 0x221550, .mask = 0xfffff0, @@ -87,7 +87,7 @@ static int ksz8061_config(struct phy_device *phydev) return phy_write(phydev, MDIO_MMD_PMAPMD, MDIO_DEVID1, 0xB61A); } -static struct phy_driver KSZ8061_driver = { +U_BOOT_PHY_DRIVER(ksz8061) = { .name = "Micrel KSZ8061", .uid = 0x00221570, .mask = 0xfffff0, @@ -115,7 +115,7 @@ static int ksz8081_config(struct phy_device *phydev) return genphy_config(phydev); } -static struct phy_driver KSZ8081_driver = { +U_BOOT_PHY_DRIVER(ksz8081) = { .name = "Micrel KSZ8081", .uid = 0x221560, .mask = 0xfffff0, @@ -172,7 +172,7 @@ static int ksz8895_startup(struct phy_device *phydev) return 0; } -static struct phy_driver ksz8895_driver = { +U_BOOT_PHY_DRIVER(ksz8895) = { .name = "Micrel KSZ8895/KSZ8864", .uid = 0x221450, .mask = 0xffffe1, @@ -185,7 +185,7 @@ static struct phy_driver ksz8895_driver = { /* Micrel used the exact same model number for the KSZ9021, * so the revision number is used to distinguish them. */ -static struct phy_driver KS8721_driver = { +U_BOOT_PHY_DRIVER(ks8721) = { .name = "Micrel KS8721BL", .uid = 0x221618, .mask = 0xfffffc, @@ -210,7 +210,7 @@ static int ksz886x_startup(struct phy_device *phydev) return 0; } -static struct phy_driver ksz886x_driver = { +U_BOOT_PHY_DRIVER(ksz886x) = { .name = "Micrel KSZ886x Switch", .uid = 0x00221430, .mask = 0xfffff0, @@ -219,16 +219,3 @@ static struct phy_driver ksz886x_driver = { .startup = &ksz886x_startup, .shutdown = &genphy_shutdown, }; - -int phy_micrel_ksz8xxx_init(void) -{ - phy_register(&KSZ804_driver); - phy_register(&KSZ8031_driver); - phy_register(&KSZ8051_driver); - phy_register(&KSZ8061_driver); - phy_register(&KSZ8081_driver); - phy_register(&KS8721_driver); - phy_register(&ksz8895_driver); - phy_register(&ksz886x_driver); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index efc75808ead..b2b2d6edfa7 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_MICREL_KSZ8XXX - phy_micrel_ksz8xxx_init(); -#endif #ifdef CONFIG_PHY_MICREL_KSZ90X1 phy_micrel_ksz90x1_init(); #endif diff --git a/include/phy.h b/include/phy.h index 77e46ebac83..27d9742c6c4 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_micrel_ksz8xxx_init(void); int phy_micrel_ksz90x1_init(void); int phy_meson_gxl_init(void); int phy_natsemi_init(void); -- 2.39.2