[PATCH v2 1/2] net: designware: Use if instead of #if for DM_MDIO

[Sean Anderson]

Where possible, convert ifdefs on DM_MDIO into ifs.

Signed-off-by: Sean Anderson <sander...@brivo.com>
---

Changes in v2:
- New

 drivers/net/designware.c | 49 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 6ed9c6d538a..ff7294ab4f4 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -137,15 +137,16 @@ static int dw_bb_mdio_reset(struct mii_dev *bus)
 
 #endif
 
-#if IS_ENABLED(CONFIG_DM_MDIO)
-int designware_eth_mdio_read(struct udevice *mdio_dev, int addr, int devad, 
int reg)
+static int designware_eth_mdio_read(struct udevice *mdio_dev, int addr,
+                                   int devad, int reg)
 {
        struct mdio_perdev_priv *pdata = dev_get_uclass_priv(mdio_dev);
 
        return dw_mdio_read(pdata->mii_bus, addr, devad, reg);
 }
 
-int designware_eth_mdio_write(struct udevice *mdio_dev, int addr, int devad, 
int reg, u16 val)
+static int designware_eth_mdio_write(struct udevice *mdio_dev, int addr,
+                                    int devad, int reg, u16 val)
 {
        struct mdio_perdev_priv *pdata = dev_get_uclass_priv(mdio_dev);
 
@@ -162,7 +163,7 @@ int designware_eth_mdio_reset(struct udevice *mdio_dev)
 }
 #endif
 
-static const struct mdio_ops designware_eth_mdio_ops = {
+static __maybe_unused const struct mdio_ops designware_eth_mdio_ops = {
        .read = designware_eth_mdio_read,
        .write = designware_eth_mdio_write,
 #if CONFIG_IS_ENABLED(DM_GPIO)
@@ -170,7 +171,7 @@ static const struct mdio_ops designware_eth_mdio_ops = {
 #endif
 };
 
-static int designware_eth_mdio_probe(struct udevice *dev)
+static __maybe_unused int designware_eth_mdio_probe(struct udevice *dev)
 {
        /* Use the priv data of parent */
        dev_set_priv(dev, dev_get_priv(dev->parent));
@@ -178,6 +179,7 @@ static int designware_eth_mdio_probe(struct udevice *dev)
        return 0;
 }
 
+#if CONFIG_IS_ENABLED(DM_MDIO)
 U_BOOT_DRIVER(designware_eth_mdio) = {
        .name = "eth_designware_mdio",
        .id = UCLASS_MDIO,
@@ -208,7 +210,6 @@ static int dw_mdio_init(const char *name, void *priv)
        return mdio_register(bus);
 }
 
-#if IS_ENABLED(CONFIG_DM_MDIO)
 static int dw_dm_mdio_init(const char *name, void *priv)
 {
        struct udevice *dev = priv;
@@ -234,7 +235,6 @@ static int dw_dm_mdio_init(const char *name, void *priv)
 
        return dw_mdio_init(name, priv);
 }
-#endif
 
 #if IS_ENABLED(CONFIG_BITBANGMII) && IS_ENABLED(CONFIG_DM_GPIO)
 static int dw_eth_bb_mdio_active(struct mii_dev *miidev)
@@ -757,24 +757,24 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev)
        if (IS_ENABLED(CONFIG_DM_ETH_PHY))
                eth_phy_set_mdio_bus(dev, NULL);
 
-#if IS_ENABLED(CONFIG_DM_MDIO)
-       phydev = dm_eth_phy_connect(dev);
-       if (!phydev)
-               return -ENODEV;
-#else
-       int phy_addr = -1;
+       if (IS_ENABLED(CONFIG_DM_MDIO)) {
+               phydev = dm_eth_phy_connect(dev);
+               if (!phydev)
+                       return -ENODEV;
+       } else {
+               int phy_addr = -1;
 
-       if (IS_ENABLED(CONFIG_DM_ETH_PHY))
-               phy_addr = eth_phy_get_addr(dev);
+               if (IS_ENABLED(CONFIG_DM_ETH_PHY))
+                       phy_addr = eth_phy_get_addr(dev);
 
 #ifdef CONFIG_PHY_ADDR
-       phy_addr = CONFIG_PHY_ADDR;
+               phy_addr = CONFIG_PHY_ADDR;
 #endif
 
-       phydev = phy_connect(priv->bus, phy_addr, dev, priv->interface);
-       if (!phydev)
-               return -ENODEV;
-#endif
+               phydev = phy_connect(priv->bus, phy_addr, dev, priv->interface);
+               if (!phydev)
+                       return -ENODEV;
+       }
 
        phydev->supported &= PHY_GBIT_FEATURES;
        if (priv->max_speed) {
@@ -962,11 +962,10 @@ int designware_eth_probe(struct udevice *dev)
        } else
 #endif
        {
-#if IS_ENABLED(CONFIG_DM_MDIO)
-               ret = dw_dm_mdio_init(dev->name, dev);
-#else
-               ret = dw_mdio_init(dev->name, dev);
-#endif
+               if (IS_ENABLED(CONFIG_DM_MDIO))
+                       ret = dw_dm_mdio_init(dev->name, dev);
+               else
+                       ret = dw_mdio_init(dev->name, dev);
                if (ret) {
                        err = ret;
                        goto mdio_err;
-- 
2.53.0