summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <[email protected]>2023-03-19 18:03:09 +0100
committerMarek Vasut <[email protected]>2023-04-07 14:18:50 +0200
commit7f4e6c2ae129a3315390cc2ee76badade98e2e62 (patch)
tree7fcb6e2adee8a087cfa2e5300971e81c80f6d104
parent5c359aa712d2b91e23df15a2b11cc72aa3682b30 (diff)
net: phy: fixed: 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 <[email protected]> Reviewed-by: Ramon Fried <[email protected]> Acked-by: Michal Simek <[email protected]> Tested-by: Michal Simek <[email protected]> #microblaze (MANUAL_RELOC)
-rw-r--r--drivers/net/phy/fixed.c8
-rw-r--r--drivers/net/phy/phy.c3
-rw-r--r--include/phy.h1
3 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 1192915ee52..2f0823b8365 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -93,7 +93,7 @@ static int fixedphy_shutdown(struct phy_device *phydev)
return 0;
}
-static struct phy_driver fixedphy_driver = {
+U_BOOT_PHY_DRIVER(fixedphy) = {
.uid = PHY_FIXED_ID,
.mask = 0xffffffff,
.name = "Fixed PHY",
@@ -103,9 +103,3 @@ static struct phy_driver fixedphy_driver = {
.startup = fixedphy_startup,
.shutdown = fixedphy_shutdown,
};
-
-int phy_fixed_init(void)
-{
- phy_register(&fixedphy_driver);
- return 0;
-}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index c20e750aa16..245357c31dc 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_FIXED
- phy_fixed_init();
-#endif
#ifdef CONFIG_PHY_NCSI
phy_ncsi_init();
#endif
diff --git a/include/phy.h b/include/phy.h
index e4a3e10c48b..9cabfeedec8 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_fixed_init(void);
int phy_ncsi_init(void);
int phy_xilinx_gmii2rgmii_init(void);