net: phy: cortina: 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/cortina.c b/drivers/net/phy/cortina.c
index df5a73d6112c9bf6caf98044b45dbbfd648b88df..1cf8b28f5827fba1c0fa8aa3a42fcbd64d0a16e1 100644 (file)
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -382,7 +382,7 @@ int cs4223_startup(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver cs4340_driver = {
+U_BOOT_PHY_DRIVER(cs4340) = {
        .name = "Cortina CS4315/CS4340",
        .uid = PHY_UID_CS4340,
        .mask = 0xfffffff0,
@@ -396,7 +396,7 @@ static struct phy_driver cs4340_driver = {
        .shutdown = &gen10g_shutdown,
 };
 
-static struct phy_driver cs4223_driver = {
+U_BOOT_PHY_DRIVER(cs4223) = {
        .name = "Cortina CS4223",
        .uid = PHY_UID_CS4223,
        .mask = 0x0ffff00f,
@@ -409,13 +409,6 @@ static struct phy_driver cs4223_driver = {
        .shutdown = &gen10g_shutdown,
 };
 
-int phy_cortina_init(void)
-{
-       phy_register(&cs4340_driver);
-       phy_register(&cs4223_driver);
-       return 0;
-}
-
 int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id)
 {
        int phy_reg;

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 4446902ab6306d63d3660917e2038504bd7e4375..d595290dd4bb614130ffeed59494fdeefcfda7ca 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -517,9 +517,6 @@ int phy_init(void)
 #ifdef CONFIG_MV88E61XX_SWITCH
        phy_mv88e61xx_init();
 #endif
-#ifdef CONFIG_PHY_CORTINA
-       phy_cortina_init();
-#endif
 #ifdef CONFIG_PHY_DAVICOM
        phy_davicom_init();
 #endif

diff --git a/include/phy.h b/include/phy.h
index 50a53982810b27a0e6a2b4a2ca93633cf4cf626a..797139bf6812102a1360a9c2b68237f3cb254cb0 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -316,7 +316,6 @@ int gen10g_shutdown(struct phy_device *phydev);
 int gen10g_discover_mmds(struct phy_device *phydev);
 
 int phy_mv88e61xx_init(void);
-int phy_cortina_init(void);
 int phy_davicom_init(void);
 int phy_et1011c_init(void);
 int phy_lxt_init(void);