[PATCH 40/41] net: phy: Re-inline phy_drv_reloc()

[Marek Vasut]

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+rene...@mailbox.org>
---
Cc: "Ariel D'Alessandro" <ariel.dalessan...@collabora.com>
Cc: "Cédric Le Goater" <c...@kaod.org>
Cc: "Marek Behún" <ka...@kernel.org>
Cc: Alex Nemirovsky <alex.nemirov...@cortina-access.com>
Cc: Haolin Li <li.hao...@qq.com>
Cc: Heinrich Schuchardt <xypron.g...@gmx.de>
Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Joel Stanley <j...@jms.id.au>
Cc: Josua Mayer <jo...@solid-run.com>
Cc: Marek Vasut <marek.vasut+rene...@mailbox.org>
Cc: Michael Trimarchi <mich...@amarulasolutions.com>
Cc: Michal Simek <michal.si...@amd.com>
Cc: Nate Drude <nat...@variscite.com>
Cc: Neil Armstrong <neil.armstr...@linaro.org>
Cc: Radu Pirea <radu-nicolae.pi...@oss.nxp.com>
Cc: Ramon Fried <rfried....@gmail.com>
Cc: Samuel Mendoza-Jonas <s...@mendozajonas.com>
Cc: Stefan Roese <s...@denx.de>
Cc: T Karthik Reddy <t.karthik.re...@xilinx.com>
Cc: Tim Harvey <thar...@gateworks.com>
Cc: Vladimir Oltean <vladimir.olt...@nxp.com>
Cc: u-boot-amlo...@groups.io
---
 drivers/net/phy/phy.c | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 15da9a80de2..61603f28179 100644
--- 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;
-- 
2.39.2