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/ca_phy.c | 11 ++---------
drivers/net/phy/phy.c | 3 ---
include/phy.h | 1 -
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/net/phy/ca_phy.c b/drivers/net/phy/ca_phy.c
index 9180a41111c..edef21867b0 100644
--- a/drivers/net/phy/ca_phy.c
+++ b/drivers/net/phy/ca_phy.c
@@ -104,7 +104,7 @@ static int rtl8211_probe(struct phy_device *phydev)
}
/* Support for RTL8211 External PHY */
-static struct phy_driver rtl8211_external_driver = {
+U_BOOT_PHY_DRIVER(rtl8211_external) = {
.name = "Cortina RTL8211 External",
.uid = PHY_ID_RTL8211_EXT,
.mask = PHY_ID_MASK,
@@ -115,7 +115,7 @@ static struct phy_driver rtl8211_external_driver = {
};
/* Support for RTL8211 Internal PHY */
-static struct phy_driver rtl8211_internal_driver = {
+U_BOOT_PHY_DRIVER(rtl8211_internal) = {
.name = "Cortina RTL8211 Inrernal",
.uid = PHY_ID_RTL8211_INT,
.mask = PHY_ID_MASK,
@@ -124,10 +124,3 @@ static struct phy_driver rtl8211_internal_driver = {
.probe = &rtl8211_probe,
.startup = &genphy_startup,
};
-
-int phy_cortina_access_init(void)
-{
- phy_register(&rtl8211_external_driver);
- phy_register(&rtl8211_internal_driver);
- return 0;
-}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 4b1fed1ff6f..4446902ab63 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -520,9 +520,6 @@ int phy_init(void)
#ifdef CONFIG_PHY_CORTINA
phy_cortina_init();
#endif
-#ifdef CONFIG_PHY_CORTINA_ACCESS
- phy_cortina_access_init();
-#endif
#ifdef CONFIG_PHY_DAVICOM
phy_davicom_init();
#endif
diff --git a/include/phy.h b/include/phy.h
index cecfbe6968f..50a53982810 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -317,7 +317,6 @@ int gen10g_discover_mmds(struct phy_device *phydev);
int phy_mv88e61xx_init(void);
int phy_cortina_init(void);
-int phy_cortina_access_init(void);
int phy_davicom_init(void);
int phy_et1011c_init(void);
int phy_lxt_init(void);
--
2.39.2
