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/aquantia.c | 33 +++++++++------------------------
drivers/net/phy/phy.c | 3 ---
include/phy.h | 1 -
3 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index fa887ade0c2..a958e88d44f 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -598,7 +598,7 @@ int aquantia_startup(struct phy_device *phydev)
return 0;
}
-static struct phy_driver aq1202_driver = {
+U_BOOT_PHY_DRIVER(aq1202) = {
.name = "Aquantia AQ1202",
.uid = 0x3a1b445,
.mask = 0xfffffff0,
@@ -611,7 +611,7 @@ static struct phy_driver aq1202_driver = {
.shutdown = &gen10g_shutdown,
};
-static struct phy_driver aq2104_driver = {
+U_BOOT_PHY_DRIVER(aq2104) = {
.name = "Aquantia AQ2104",
.uid = 0x3a1b460,
.mask = 0xfffffff0,
@@ -624,7 +624,7 @@ static struct phy_driver aq2104_driver = {
.shutdown = &gen10g_shutdown,
};
-static struct phy_driver aqr105_driver = {
+U_BOOT_PHY_DRIVER(aqr105) = {
.name = "Aquantia AQR105",
.uid = 0x3a1b4a2,
.mask = 0xfffffff0,
@@ -638,7 +638,7 @@ static struct phy_driver aqr105_driver = {
.data = AQUANTIA_GEN1,
};
-static struct phy_driver aqr106_driver = {
+U_BOOT_PHY_DRIVER(aqr106) = {
.name = "Aquantia AQR106",
.uid = 0x3a1b4d0,
.mask = 0xfffffff0,
@@ -651,7 +651,7 @@ static struct phy_driver aqr106_driver = {
.shutdown = &gen10g_shutdown,
};
-static struct phy_driver aqr107_driver = {
+U_BOOT_PHY_DRIVER(aqr107) = {
.name = "Aquantia AQR107",
.uid = 0x3a1b4e0,
.mask = 0xfffffff0,
@@ -665,7 +665,7 @@ static struct phy_driver aqr107_driver = {
.data = AQUANTIA_GEN2,
};
-static struct phy_driver aqr112_driver = {
+U_BOOT_PHY_DRIVER(aqr112) = {
.name = "Aquantia AQR112",
.uid = 0x3a1b660,
.mask = 0xfffffff0,
@@ -679,7 +679,7 @@ static struct phy_driver aqr112_driver = {
.data = AQUANTIA_GEN3,
};
-static struct phy_driver aqr113c_driver = {
+U_BOOT_PHY_DRIVER(aqr113c) = {
.name = "Aquantia AQR113C",
.uid = 0x31c31c12,
.mask = 0xfffffff0,
@@ -693,7 +693,7 @@ static struct phy_driver aqr113c_driver = {
.data = AQUANTIA_GEN3,
};
-static struct phy_driver aqr405_driver = {
+U_BOOT_PHY_DRIVER(aqr405) = {
.name = "Aquantia AQR405",
.uid = 0x3a1b4b2,
.mask = 0xfffffff0,
@@ -707,7 +707,7 @@ static struct phy_driver aqr405_driver = {
.data = AQUANTIA_GEN1,
};
-static struct phy_driver aqr412_driver = {
+U_BOOT_PHY_DRIVER(aqr412) = {
.name = "Aquantia AQR412",
.uid = 0x3a1b710,
.mask = 0xfffffff0,
@@ -720,18 +720,3 @@ static struct phy_driver aqr412_driver = {
.shutdown = &gen10g_shutdown,
.data = AQUANTIA_GEN3,
};
-
-int phy_aquantia_init(void)
-{
- phy_register(&aq1202_driver);
- phy_register(&aq2104_driver);
- phy_register(&aqr105_driver);
- phy_register(&aqr106_driver);
- phy_register(&aqr107_driver);
- phy_register(&aqr112_driver);
- phy_register(&aqr113c_driver);
- phy_register(&aqr405_driver);
- phy_register(&aqr412_driver);
-
- return 0;
-}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index ecb4b72ed10..4f17f98876e 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -520,9 +520,6 @@ int phy_init(void)
#ifdef CONFIG_MV88E61XX_SWITCH
phy_mv88e61xx_init();
#endif
-#ifdef CONFIG_PHY_AQUANTIA
- phy_aquantia_init();
-#endif
#ifdef CONFIG_PHY_ATHEROS
phy_atheros_init();
#endif
diff --git a/include/phy.h b/include/phy.h
index dbc0da7e084..a0060cd19ea 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -317,7 +317,6 @@ int gen10g_discover_mmds(struct phy_device *phydev);
int phy_b53_init(void);
int phy_mv88e61xx_init(void);
-int phy_aquantia_init(void);
int phy_atheros_init(void);
int phy_broadcom_init(void);
int phy_cortina_init(void);
--
2.39.2
