colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: atheros: Convert to U_BOOT_PHY_DRIVER()

Browse Source 
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)
This commit is contained in:
Marek Vasut
2023-03-19 18:02:45 +01:00
parent a5fbc10560
commit fba31ab92c
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/phy/atheros.c
View File

@@ -333,7 +333,7 @@ static int ar803x_config(struct phy_device *phydev)
return 0; return 0;
} }
static struct phy_driver AR8021_driver = { U_BOOT_PHY_DRIVER(AR8021) = {
.name = "AR8021", .name = "AR8021",
.uid = AR8021_PHY_ID, .uid = AR8021_PHY_ID,
.mask = 0xfffffff0, .mask = 0xfffffff0,
@@ -343,7 +343,7 @@ static struct phy_driver AR8021_driver = {
.shutdown = genphy_shutdown, .shutdown = genphy_shutdown,
}; };
static struct phy_driver AR8031_driver = { U_BOOT_PHY_DRIVER(AR8031) = {
.name = "AR8031/AR8033", .name = "AR8031/AR8033",
.uid = AR8031_PHY_ID, .uid = AR8031_PHY_ID,
.mask = 0xffffffef, .mask = 0xffffffef,
@@ -353,7 +353,7 @@ static struct phy_driver AR8031_driver = {
.shutdown = genphy_shutdown, .shutdown = genphy_shutdown,
}; };
static struct phy_driver AR8035_driver = { U_BOOT_PHY_DRIVER(AR8035) = {
.name = "AR8035", .name = "AR8035",
.uid = AR8035_PHY_ID, .uid = AR8035_PHY_ID,
.mask = 0xffffffef, .mask = 0xffffffef,
@@ -362,12 +362,3 @@ static struct phy_driver AR8035_driver = {
.startup = genphy_startup, .startup = genphy_startup,
.shutdown = genphy_shutdown, .shutdown = genphy_shutdown,
}; };
int phy_atheros_init(void)
{
phy_register(&AR8021_driver);
phy_register(&AR8031_driver);
phy_register(&AR8035_driver);
return 0;
}

3
drivers/net/phy/phy.c
View File

@@ -520,9 +520,6 @@ int phy_init(void)
#ifdef CONFIG_MV88E61XX_SWITCH #ifdef CONFIG_MV88E61XX_SWITCH
phy_mv88e61xx_init(); phy_mv88e61xx_init();
#endif #endif
#ifdef CONFIG_PHY_ATHEROS
phy_atheros_init();
#endif
#ifdef CONFIG_PHY_BROADCOM #ifdef CONFIG_PHY_BROADCOM
phy_broadcom_init(); phy_broadcom_init();
#endif #endif

1
include/phy.h
View File

@@ -317,7 +317,6 @@ int gen10g_discover_mmds(struct phy_device *phydev);
int phy_b53_init(void); int phy_b53_init(void);
int phy_mv88e61xx_init(void); int phy_mv88e61xx_init(void);
int phy_atheros_init(void);
int phy_broadcom_init(void); int phy_broadcom_init(void);
int phy_cortina_init(void); int phy_cortina_init(void);
int phy_cortina_access_init(void); int phy_cortina_access_init(void);