]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: stmmac: reduce indentation by adding a continue
authorLABBE Corentin <clabbe.montjoie@gmail.com>
Wed, 15 Feb 2017 09:46:44 +0000 (10:46 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Feb 2017 18:20:55 +0000 (13:20 -0500)
As suggested by Joe Perches, replacing the "if phydev" logic permit to
reduce indentation in the for loop.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Reviewed-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

index a6957738a43288f8fc6cafdc8c3d2a05ceafd38c..db157a47000c65fb588d3f1c5dfe21bbd20983fb 100644 (file)
@@ -247,50 +247,48 @@ int stmmac_mdio_register(struct net_device *ndev)
        found = 0;
        for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
                struct phy_device *phydev = mdiobus_get_phy(new_bus, addr);
+               int act = 0;
+               char irq_num[4];
+               char *irq_str;
+
+               if (!phydev)
+                       continue;
+
+               /*
+                * If an IRQ was provided to be assigned after
+                * the bus probe, do it here.
+                */
+               if (!mdio_bus_data->irqs &&
+                   (mdio_bus_data->probed_phy_irq > 0)) {
+                       new_bus->irq[addr] = mdio_bus_data->probed_phy_irq;
+                       phydev->irq = mdio_bus_data->probed_phy_irq;
+               }
 
-               if (phydev) {
-                       int act = 0;
-                       char irq_num[4];
-                       char *irq_str;
-
-                       /*
-                        * If an IRQ was provided to be assigned after
-                        * the bus probe, do it here.
-                        */
-                       if (!mdio_bus_data->irqs &&
-                           (mdio_bus_data->probed_phy_irq > 0)) {
-                               new_bus->irq[addr] =
-                                       mdio_bus_data->probed_phy_irq;
-                               phydev->irq = mdio_bus_data->probed_phy_irq;
-                       }
-
-                       /*
-                        * If we're going to bind the MAC to this PHY bus,
-                        * and no PHY number was provided to the MAC,
-                        * use the one probed here.
-                        */
-                       if (priv->plat->phy_addr == -1)
-                               priv->plat->phy_addr = addr;
-
-                       act = (priv->plat->phy_addr == addr);
-                       switch (phydev->irq) {
-                       case PHY_POLL:
-                               irq_str = "POLL";
-                               break;
-                       case PHY_IGNORE_INTERRUPT:
-                               irq_str = "IGNORE";
-                               break;
-                       default:
-                               sprintf(irq_num, "%d", phydev->irq);
-                               irq_str = irq_num;
-                               break;
-                       }
-                       netdev_info(ndev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
-                                   phydev->phy_id, addr,
-                                   irq_str, phydev_name(phydev),
-                                   act ? " active" : "");
-                       found = 1;
+               /*
+                * If we're going to bind the MAC to this PHY bus,
+                * and no PHY number was provided to the MAC,
+                * use the one probed here.
+                */
+               if (priv->plat->phy_addr == -1)
+                       priv->plat->phy_addr = addr;
+
+               act = (priv->plat->phy_addr == addr);
+               switch (phydev->irq) {
+               case PHY_POLL:
+                       irq_str = "POLL";
+                       break;
+               case PHY_IGNORE_INTERRUPT:
+                       irq_str = "IGNORE";
+                       break;
+               default:
+                       sprintf(irq_num, "%d", phydev->irq);
+                       irq_str = irq_num;
+                       break;
                }
+               netdev_info(ndev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
+                           phydev->phy_id, addr, irq_str, phydev_name(phydev),
+                           act ? " active" : "");
+               found = 1;
        }
 
        if (!found && !mdio_node) {