diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2014-08-01 11:56:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-02 19:29:53 -0700 |
| commit | 8c43a2cc75b3bf4f89ea439f4439a2a61f22c961 (patch) | |
| tree | ae733f9d96c697a62698c3f1442c2ea42cfb19fd /drivers/net/ethernet/amd | |
| parent | ae29223eaf0ecf4c701457a6b40d7b8f19c90413 (diff) | |
amd-xgbe: Remove unnecessary spinlocks
Remove the spinlocks around the ethtool get and set settings
functions and within the link adjustment callback routine.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 20 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 5 |
2 files changed, 5 insertions, 20 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c index 6005b6021f78..a076aca138a1 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c @@ -290,13 +290,9 @@ static int xgbe_get_settings(struct net_device *netdev, if (!pdata->phydev) return -ENODEV; - spin_lock_irq(&pdata->lock); - ret = phy_ethtool_gset(pdata->phydev, cmd); cmd->transceiver = XCVR_EXTERNAL; - spin_unlock_irq(&pdata->lock); - DBGPR("<--xgbe_get_settings\n"); return ret; @@ -315,17 +311,14 @@ static int xgbe_set_settings(struct net_device *netdev, if (!pdata->phydev) return -ENODEV; - spin_lock_irq(&pdata->lock); - speed = ethtool_cmd_speed(cmd); - ret = -EINVAL; if (cmd->phy_address != phydev->addr) - goto unlock; + return -EINVAL; if ((cmd->autoneg != AUTONEG_ENABLE) && (cmd->autoneg != AUTONEG_DISABLE)) - goto unlock; + return -EINVAL; if (cmd->autoneg == AUTONEG_DISABLE) { switch (speed) { @@ -334,16 +327,16 @@ static int xgbe_set_settings(struct net_device *netdev, case SPEED_1000: break; default: - goto unlock; + return -EINVAL; } if (cmd->duplex != DUPLEX_FULL) - goto unlock; + return -EINVAL; } cmd->advertising &= phydev->supported; if ((cmd->autoneg == AUTONEG_ENABLE) && !cmd->advertising) - goto unlock; + return -EINVAL; ret = 0; phydev->autoneg = cmd->autoneg; @@ -359,9 +352,6 @@ static int xgbe_set_settings(struct net_device *netdev, if (netif_running(netdev)) ret = phy_start_aneg(phydev); -unlock: - spin_unlock_irq(&pdata->lock); - DBGPR("<--xgbe_set_settings\n"); return ret; diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c index 225f22d5fe0a..eecd360430a4 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c @@ -163,7 +163,6 @@ static void xgbe_adjust_link(struct net_device *netdev) struct xgbe_prv_data *pdata = netdev_priv(netdev); struct xgbe_hw_if *hw_if = &pdata->hw_if; struct phy_device *phydev = pdata->phydev; - unsigned long flags; int new_state = 0; if (phydev == NULL) @@ -172,8 +171,6 @@ static void xgbe_adjust_link(struct net_device *netdev) DBGPR_MDIO("-->xgbe_adjust_link: address=%d, newlink=%d, curlink=%d\n", phydev->addr, phydev->link, pdata->phy_link); - spin_lock_irqsave(&pdata->lock, flags); - if (phydev->link) { /* Flow control support */ if (pdata->pause_autoneg) { @@ -229,8 +226,6 @@ static void xgbe_adjust_link(struct net_device *netdev) if (new_state) phy_print_status(phydev); - spin_unlock_irqrestore(&pdata->lock, flags); - DBGPR_MDIO("<--xgbe_adjust_link\n"); } |