net: phy: Re-inline phy_drv_reloc()

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)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 15da9a8..61603f2 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -463,28 +463,6 @@ U_BOOT_PHY_DRIVER(genphy) = {
        .shutdown       = genphy_shutdown,
 };
 
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-static void phy_drv_reloc(struct phy_driver *drv)
-{
-       if (drv->probe)
-               drv->probe += gd->reloc_off;
-       if (drv->config)
-               drv->config += gd->reloc_off;
-       if (drv->startup)
-               drv->startup += gd->reloc_off;
-       if (drv->shutdown)
-               drv->shutdown += gd->reloc_off;
-       if (drv->readext)
-               drv->readext += gd->reloc_off;
-       if (drv->writeext)
-               drv->writeext += gd->reloc_off;
-       if (drv->read_mmd)
-               drv->read_mmd += gd->reloc_off;
-       if (drv->write_mmd)
-               drv->write_mmd += gd->reloc_off;
-}
-#endif
-
 int phy_init(void)
 {
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
@@ -493,8 +471,24 @@ int phy_init(void)
 
        /* 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);
+       for (drv = ll_entry; drv != ll_entry + ll_n_ents; drv++) {
+               if (drv->probe)
+                       drv->probe += gd->reloc_off;
+               if (drv->config)
+                       drv->config += gd->reloc_off;
+               if (drv->startup)
+                       drv->startup += gd->reloc_off;
+               if (drv->shutdown)
+                       drv->shutdown += gd->reloc_off;
+               if (drv->readext)
+                       drv->readext += gd->reloc_off;
+               if (drv->writeext)
+                       drv->writeext += gd->reloc_off;
+               if (drv->read_mmd)
+                       drv->read_mmd += gd->reloc_off;
+               if (drv->write_mmd)
+                       drv->write_mmd += gd->reloc_off;
+       }
 #endif
 
        return 0;