From f7053296cbe75fa7e5634b63d983e9d630052a96 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@mailbox.org>
Date: Sun, 19 Mar 2023 18:03:12 +0100
Subject: [PATCH] net: phy: genphy: 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)
---
drivers/net/phy/phy.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 9d5d149461..b1e9861c6f 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -451,7 +451,7 @@ int genphy_shutdown(struct phy_device *phydev)
return 0;
}
-static struct phy_driver genphy_driver = {
+U_BOOT_PHY_DRIVER(genphy) = {
.uid = 0xffffffff,
.mask = 0xffffffff,
.name = "Generic PHY",
@@ -463,11 +463,6 @@ static struct phy_driver genphy_driver = {
.shutdown = genphy_shutdown,
};
-static int genphy_init(void)
-{
- return phy_register(&genphy_driver);
-}
-
static LIST_HEAD(phy_drivers);
#ifdef CONFIG_NEEDS_MANUAL_RELOC
@@ -514,8 +509,6 @@ int phy_init(void)
phy_drv_reloc(drv);
#endif
- genphy_init();
-
return 0;
}
@@ -576,7 +569,7 @@ static struct phy_driver *generic_for_phy(struct phy_device *phydev)
return &gen10g_driver;
#endif
- return &genphy_driver;
+ return ll_entry_get(struct phy_driver, genphy, phy_driver);
}
static struct phy_driver *get_phy_driver(struct phy_device *phydev)
--
2.39.5