dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: phy: Re-inline phy_drv_reloc()

Browse Source 
Wrap phy_drv_reloc() back into phy_init() to reduce ifdeffery,
since phy_drv_reloc() is now called only from one call site.
No functional change.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
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:03:16 +01:00
parent 7da03bbc57
commit c878e70beb
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -463,9 +463,15 @@ U_BOOT_PHY_DRIVER(genphy) = {
.shutdown = genphy_shutdown, .shutdown = genphy_shutdown,
}; };
#ifdef CONFIG_NEEDS_MANUAL_RELOC int phy_init(void)
static void phy_drv_reloc(struct phy_driver *drv)
{ {
#ifdef CONFIG_NEEDS_MANUAL_RELOC
const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver);
struct phy_driver *drv, *ll_entry;
/* Perform manual relocation on linker list based PHY drivers */
ll_entry = ll_entry_start(struct phy_driver, phy_driver);
for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++) {
if (drv->probe) if (drv->probe)
drv->probe += gd->reloc_off; drv->probe += gd->reloc_off;
if (drv->config) if (drv->config)
@@ -485,18 +491,6 @@ static void phy_drv_reloc(struct phy_driver *drv)
} }
#endif #endif
int phy_init(void)
{
#ifdef CONFIG_NEEDS_MANUAL_RELOC
const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver);
struct phy_driver *drv, *ll_entry;
/* Perform manual relocation on linker list based PHY drivers */
ll_entry = ll_entry_start(struct phy_driver, phy_driver);
for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++)
phy_drv_reloc(drv);
#endif
return 0; return 0;
} }