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/lxt.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/lxt.c b/drivers/net/phy/lxt.c
index 2618deb0096..20940033a38 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -58,7 +58,7 @@ static int lxt971_startup(struct phy_device *phydev)
return lxt971_parse_status(phydev);
}
-static struct phy_driver LXT971_driver = {
+U_BOOT_PHY_DRIVER(lxt971) = {
.name = "LXT971",
.uid = 0x1378e0,
.mask = 0xfffff0,
@@ -67,10 +67,3 @@ static struct phy_driver LXT971_driver = {
.startup = &lxt971_startup,
.shutdown = &genphy_shutdown,
};
-
-int phy_lxt_init(void)
-{
- phy_register(&LXT971_driver);
-
- return 0;
-}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 5b6e6294377..e2e31773f6a 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_LXT
- phy_lxt_init();
-#endif
#ifdef CONFIG_PHY_MARVELL
phy_marvell_init();
#endif
diff --git a/include/phy.h b/include/phy.h
index 3bc4a0de724..a309056ce77 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_lxt_init(void);
int phy_marvell_init(void);
int phy_micrel_ksz8xxx_init(void);
int phy_micrel_ksz90x1_init(void);
--
2.39.2
