stmmac: simple cleanups

This adds simple cleanups for stmmac, removing test we know is always
true, fixing whitespace, and moving code out of if().

Signed-off-by: Pavel Machek <pavel@denx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 9af50bae4dde67c543c15e0344f90ac9d53fd2b8..493fe693e675b3e33a675147edba03324bb6d819 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -261,11 +261,11 @@ static int stmmac_ethtool_getsettings(struct net_device *dev,
                ethtool_cmd_speed_set(cmd, priv->xstats.pcs_speed);
 
                /* Get and convert ADV/LP_ADV from the HW AN registers */
-               if (priv->hw->mac->get_adv)
-                       priv->hw->mac->get_adv(priv->hw, &adv);
-               else
+               if (!priv->hw->mac->get_adv)
                        return -EOPNOTSUPP;     /* should never happen indeed */
 
+               priv->hw->mac->get_adv(priv->hw, &adv);
+
                /* Encoding of PSE bits is defined in 802.3z, 37.2.1.4 */
 
                if (adv.pause & STMMAC_PCS_PAUSE)
@@ -340,19 +340,17 @@ static int stmmac_ethtool_setsettings(struct net_device *dev,
                if (cmd->autoneg != AUTONEG_ENABLE)
                        return -EINVAL;
 
-               if (cmd->autoneg == AUTONEG_ENABLE) {
-                       mask &= (ADVERTISED_1000baseT_Half |
+               mask &= (ADVERTISED_1000baseT_Half |
                        ADVERTISED_1000baseT_Full |
                        ADVERTISED_100baseT_Half |
                        ADVERTISED_100baseT_Full |
                        ADVERTISED_10baseT_Half |
                        ADVERTISED_10baseT_Full);
 
-                       spin_lock(&priv->lock);
-                       if (priv->hw->mac->ctrl_ane)
-                               priv->hw->mac->ctrl_ane(priv->hw, 1);
-                       spin_unlock(&priv->lock);
-               }
+               spin_lock(&priv->lock);
+               if (priv->hw->mac->ctrl_ane)
+                       priv->hw->mac->ctrl_ane(priv->hw, 1);
+               spin_unlock(&priv->lock);
 
                return 0;
        }

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 08addd65372818f48075b585eeb1d36ab682025b..8fcc64c37ff1b28d57a6e19807b2beb073b74541 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -818,7 +818,7 @@ static int stmmac_init_phy(struct net_device *dev)
        /* Stop Advertising 1000BASE Capability if interface is not GMII */
        if ((interface == PHY_INTERFACE_MODE_MII) ||
            (interface == PHY_INTERFACE_MODE_RMII) ||
-               (max_speed < 1000 &&  max_speed > 0))
+               (max_speed < 1000 && max_speed > 0))
                phydev->advertising &= ~(SUPPORTED_1000baseT_Half |
                                         SUPPORTED_1000baseT_Full);
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index a5b1e1b776fe3313c5c9852062ed66ea1547c285..8dd040827c69381c5fd5441350fcc7511e84c704 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -253,7 +253,7 @@ int stmmac_mdio_register(struct net_device *ndev)
                        }
 
                        /*
-                        * If we're  going to bind the MAC to this PHY bus,
+                        * 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.
                         */