net: phy: ca_phy: Convert to U_BOOT_PHY_DRIVER()

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+renesas@mailbox.org>
Acked-by: Michal Simek <michal.simek@amd.com>
Tested-by: Michal Simek <michal.simek@amd.com> #microblaze (MANUAL_RELOC)

diff --git a/drivers/net/phy/ca_phy.c b/drivers/net/phy/ca_phy.c
index 9180a41111ccfccc535b226c32da75b96aa1734d..edef21867b04deae221fd5a0fd14d434ad0836be 100644 (file)
--- 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 4b1fed1ff6f53973fa75e54729b317dfe8e3c6a7..4446902ab6306d63d3660917e2038504bd7e4375 100644 (file)
--- 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 cecfbe6968fe5242fcf03c3d015e69068277a834..50a53982810b27a0e6a2b4a2ca93633cf4cf626a 100644 (file)
--- 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);