Commit a77e4acc authored by Pavel Machek's avatar Pavel Machek Committed by David S. Miller
Browse files

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: default avatarPavel Machek <pavel@denx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b209af99

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c

+8 −10
Original line number Diff line number Diff line
@@ -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,7 +340,6 @@ 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 |

			ADVERTISED_1000baseT_Full |

			ADVERTISED_100baseT_Half |
@@ -352,7 +351,6 @@ static int stmmac_ethtool_setsettings(struct net_device *dev, 
		if (priv->hw->mac->ctrl_ane)

			priv->hw->mac->ctrl_ane(priv->hw, 1);

		spin_unlock(&priv->lock);

		}



		return 0;

	}

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+1 −1

File changed.

Contains only whitespace changes.