net: driver: stmicro: Remove some useless the lock protection

kernel always invokes a pair of rtnl_lock adn rtnl_unlock to
protect dev_ethtool(), so its not neccessary to invoke spin_lock/unlock
in ethtool_ops.

Signed-off-by: Yang Wei <Wei.Yang@windriver.com>
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 c963394ded6c569fd06bb2cba90f2cdd6c009173..78926662d58cb7e86dc84c9962f12ffc323c212b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -322,9 +322,7 @@ static int stmmac_ethtool_getsettings(struct net_device *dev,
                return -EBUSY;
        }
        cmd->transceiver = XCVR_INTERNAL;
-       spin_lock_irq(&priv->lock);
        rc = phy_ethtool_gset(phy, cmd);
-       spin_unlock_irq(&priv->lock);
        return rc;
 }
 
@@ -442,7 +440,6 @@ stmmac_get_pauseparam(struct net_device *netdev,
        if (priv->flow_ctrl & FLOW_TX)
                pause->tx_pause = 1;
 
-       spin_unlock(&priv->lock);
 }
 
 static int
@@ -457,8 +454,6 @@ stmmac_set_pauseparam(struct net_device *netdev,
        if (priv->pcs)  /* FIXME */
                return -EOPNOTSUPP;
 
-       spin_lock(&priv->lock);
-
        if (pause->rx_pause)
                new_pause |= FLOW_RX;
        if (pause->tx_pause)
@@ -473,7 +468,6 @@ stmmac_set_pauseparam(struct net_device *netdev,
        } else
                priv->hw->mac->flow_ctrl(priv->ioaddr, phy->duplex,
                                         priv->flow_ctrl, priv->pause);
-       spin_unlock(&priv->lock);
        return ret;
 }