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+rene...@mailbox.org>
---
Cc: "Ariel D'Alessandro" <ariel.dalessan...@collabora.com>
Cc: "Cédric Le Goater" <c...@kaod.org>
Cc: "Marek Behún" <ka...@kernel.org>
Cc: Alex Nemirovsky <alex.nemirov...@cortina-access.com>
Cc: Haolin Li <li.hao...@qq.com>
Cc: Heinrich Schuchardt <xypron.g...@gmx.de>
Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Joel Stanley <j...@jms.id.au>
Cc: Josua Mayer <jo...@solid-run.com>
Cc: Marek Vasut <marek.vasut+rene...@mailbox.org>
Cc: Michael Trimarchi <mich...@amarulasolutions.com>
Cc: Michal Simek <michal.si...@amd.com>
Cc: Nate Drude <nat...@variscite.com>
Cc: Neil Armstrong <neil.armstr...@linaro.org>
Cc: Radu Pirea <radu-nicolae.pi...@oss.nxp.com>
Cc: Ramon Fried <rfried....@gmail.com>
Cc: Samuel Mendoza-Jonas <s...@mendozajonas.com>
Cc: Stefan Roese <s...@denx.de>
Cc: T Karthik Reddy <t.karthik.re...@xilinx.com>
Cc: Tim Harvey <thar...@gateworks.com>
Cc: Vladimir Oltean <vladimir.olt...@nxp.com>
Cc: u-boot-amlo...@groups.io
---
 drivers/net/phy/natsemi.c | 15 +++------------
 drivers/net/phy/phy.c     |  3 ---
 include/phy.h             |  1 -
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/drivers/net/phy/natsemi.c b/drivers/net/phy/natsemi.c
index efde4574deb..6b9e99ea115 100644
--- a/drivers/net/phy/natsemi.c
+++ b/drivers/net/phy/natsemi.c
@@ -33,7 +33,7 @@ static int dp83630_config(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver DP83630_driver = {
+U_BOOT_PHY_DRIVER(dp83630) = {
        .name = "NatSemi DP83630",
        .uid = 0x20005ce1,
        .mask = 0xfffffff0,
@@ -103,7 +103,7 @@ static int dp83865_startup(struct phy_device *phydev)
 }
 
 
-static struct phy_driver DP83865_driver = {
+U_BOOT_PHY_DRIVER(dp83865) = {
        .name = "NatSemi DP83865",
        .uid = 0x20005c70,
        .mask = 0xfffffff0,
@@ -146,7 +146,7 @@ static int dp83848_startup(struct phy_device *phydev)
        return dp83848_parse_status(phydev);
 }
 
-static struct phy_driver DP83848_driver = {
+U_BOOT_PHY_DRIVER(dp83848) = {
        .name = "NatSemi DP83848",
        .uid = 0x20005c90,
        .mask = 0x2000ff90,
@@ -155,12 +155,3 @@ static struct phy_driver DP83848_driver = {
        .startup = &dp83848_startup,
        .shutdown = &genphy_shutdown,
 };
-
-int phy_natsemi_init(void)
-{
-       phy_register(&DP83630_driver);
-       phy_register(&DP83865_driver);
-       phy_register(&DP83848_driver);
-
-       return 0;
-}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 27cc9f5ec60..3d6fc8080e5 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_NATSEMI
-       phy_natsemi_init();
-#endif
 #ifdef CONFIG_NXP_C45_TJA11XX_PHY
        phy_nxp_c45_tja11xx_init();
 #endif
diff --git a/include/phy.h b/include/phy.h
index f69f379fc2b..647d23595d1 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_natsemi_init(void);
 int phy_nxp_c45_tja11xx_init(void);
 int phy_nxp_tja11xx_init(void);
 int phy_realtek_init(void);
-- 
2.39.2

Reply via email to