aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut+renesas@mailbox.org>2023-03-19 18:02:56 +0100
committerMarek Vasut <marek.vasut+renesas@mailbox.org>2023-04-07 14:18:49 +0200
commit6b5eea7508e91659997f07139e3108a6bb1b422e (patch)
tree1ab9233464d1568be80a54091f2f3c28085fb40a /drivers/net/phy
parentf282e32d0a4ccd8dbd5e71a8c70ffa57a274b266 (diff)
downloadu-boot-6b5eea7508e91659997f07139e3108a6bb1b422e.zip
u-boot-6b5eea7508e91659997f07139e3108a6bb1b422e.tar.gz
u-boot-6b5eea7508e91659997f07139e3108a6bb1b422e.tar.bz2
net: phy: ksz90x1: 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)
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/micrel_ksz90x1.c14
-rw-r--r--drivers/net/phy/phy.c3
2 files changed, 3 insertions, 14 deletions
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index 79ebdb5..ffc3c98 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -270,7 +270,7 @@ static int ksz9021_config(struct phy_device *phydev)
return 0;
}
-static struct phy_driver ksz9021_driver = {
+U_BOOT_PHY_DRIVER(ksz9021) = {
.name = "Micrel ksz9021",
.uid = 0x221610,
.mask = 0xfffffe,
@@ -368,7 +368,7 @@ static int ksz9031_config(struct phy_device *phydev)
return genphy_config(phydev);
}
-static struct phy_driver ksz9031_driver = {
+U_BOOT_PHY_DRIVER(ksz9031) = {
.name = "Micrel ksz9031",
.uid = PHY_ID_KSZ9031,
.mask = MII_KSZ9x31_SILICON_REV_MASK,
@@ -477,7 +477,7 @@ static int ksz9131_config(struct phy_device *phydev)
return genphy_config(phydev);
}
-static struct phy_driver ksz9131_driver = {
+U_BOOT_PHY_DRIVER(ksz9131) = {
.name = "Micrel ksz9131",
.uid = PHY_ID_KSZ9131,
.mask = MII_KSZ9x31_SILICON_REV_MASK,
@@ -497,11 +497,3 @@ int ksz9xx1_phy_get_id(struct phy_device *phydev)
return phyid;
}
-
-int phy_micrel_ksz90x1_init(void)
-{
- phy_register(&ksz9021_driver);
- phy_register(&ksz9031_driver);
- phy_register(&ksz9131_driver);
- return 0;
-}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index b2b2d6e..4747011 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_MICREL_KSZ90X1
- phy_micrel_ksz90x1_init();
-#endif
#ifdef CONFIG_PHY_MESON_GXL
phy_meson_gxl_init();
#endif