]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net-next: stmmac: Convert new_state to bool
authorLABBE Corentin <clabbe.montjoie@gmail.com>
Wed, 24 May 2017 07:16:43 +0000 (09:16 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 May 2017 17:08:34 +0000 (13:08 -0400)
This patch convert new_state from int to bool since it store only 1 or 0

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index 27c12e732a8ac7ad066698ebbc21428ef93fc41e..b944eabaa1ecb508fed6f205bf535d812df1bf20 100644 (file)
@@ -775,7 +775,7 @@ static void stmmac_adjust_link(struct net_device *dev)
        struct stmmac_priv *priv = netdev_priv(dev);
        struct phy_device *phydev = dev->phydev;
        unsigned long flags;
-       int new_state = 0;
+       bool new_state = false;
 
        if (!phydev)
                return;
@@ -788,7 +788,7 @@ static void stmmac_adjust_link(struct net_device *dev)
                /* Now we make sure that we can be in full duplex mode.
                 * If not, we operate in half-duplex mode. */
                if (phydev->duplex != priv->oldduplex) {
-                       new_state = 1;
+                       new_state = true;
                        if (!(phydev->duplex))
                                ctrl &= ~priv->hw->link.duplex;
                        else
@@ -800,7 +800,7 @@ static void stmmac_adjust_link(struct net_device *dev)
                        stmmac_mac_flow_ctrl(priv, phydev->duplex);
 
                if (phydev->speed != priv->speed) {
-                       new_state = 1;
+                       new_state = true;
                        switch (phydev->speed) {
                        case 1000:
                                if (priv->plat->has_gmac ||
@@ -839,11 +839,11 @@ static void stmmac_adjust_link(struct net_device *dev)
                writel(ctrl, priv->ioaddr + MAC_CTRL_REG);
 
                if (!priv->oldlink) {
-                       new_state = 1;
+                       new_state = true;
                        priv->oldlink = 1;
                }
        } else if (priv->oldlink) {
-               new_state = 1;
+               new_state = true;
                priv->oldlink = 0;
                priv->speed = SPEED_UNKNOWN;
                priv->oldduplex = DUPLEX_UNKNOWN;