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 <[email protected]>
---
Cc: "Ariel D'Alessandro" <[email protected]>
Cc: "Cédric Le Goater" <[email protected]>
Cc: "Marek Behún" <[email protected]>
Cc: Alex Nemirovsky <[email protected]>
Cc: Haolin Li <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Joe Hershberger <[email protected]>
Cc: Joel Stanley <[email protected]>
Cc: Josua Mayer <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Michael Trimarchi <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Nate Drude <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Radu Pirea <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Samuel Mendoza-Jonas <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: T Karthik Reddy <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Vladimir Oltean <[email protected]>
Cc: [email protected]
---
drivers/net/phy/b53.c | 9 +--------
drivers/net/phy/phy.c | 3 ---
include/phy.h | 1 -
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index c706e2b9bde..26e8e2fe64f 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -612,7 +612,7 @@ static int b53_phy_startup(struct phy_device *phydev)
return 0;
}
-static struct phy_driver b53_driver = {
+U_BOOT_PHY_DRIVER(b53) = {
.name = "Broadcom BCM53125",
.uid = 0x03625c00,
.mask = 0xfffffc00,
@@ -623,13 +623,6 @@ static struct phy_driver b53_driver = {
.shutdown = &genphy_shutdown,
};
-int phy_b53_init(void)
-{
- phy_register(&b53_driver);
-
- return 0;
-}
-
int do_b53_reg_read(const char *name, int argc, char *const argv[])
{
u8 page, offset, width;
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 853302cf974..7a7762377b6 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_B53_SWITCH
- phy_b53_init();
-#endif
#ifdef CONFIG_MV88E61XX_SWITCH
phy_mv88e61xx_init();
#endif
diff --git a/include/phy.h b/include/phy.h
index a1be1fbe1a1..88c9013f1f8 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_b53_init(void);
int phy_mv88e61xx_init(void);
int phy_broadcom_init(void);
int phy_cortina_init(void);
--
2.39.2
