xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amd-xgbe: Remove unnecessary spinlocks

Browse Source 
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>
This commit is contained in:
Lendacky, Thomas
2014-08-01 11:56:29 -05:00
committed by David S. Miller
parent ae29223eaf
commit 8c43a2cc75
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
View File

@@ -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;