diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2018-09-20 04:41:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-20 08:10:07 +0200 |
| commit | 713746bb2866838bad96da3965daaa6d87dce38b (patch) | |
| tree | 8555990772465906f238e1eb3e7b2630f5022052 /drivers/net/ethernet/atheros | |
| parent | e1000: remove set but not used variable 'txb2b' (diff) | |
| download | linux-713746bb2866838bad96da3965daaa6d87dce38b.tar.xz linux-713746bb2866838bad96da3965daaa6d87dce38b.zip | |
atl1: remove set but not used variable 'advertising'
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/atheros/atlx/atl1.c: In function 'atl1_set_link_ksettings':
drivers/net/ethernet/atheros/atlx/atl1.c:3280:6: warning:
variable 'advertising' set but not used [-Wunused-but-set-variable]
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros')
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 72e7fa71e84c..63edc5706c09 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c @@ -3277,7 +3277,6 @@ static int atl1_set_link_ksettings(struct net_device *netdev, u16 phy_data; int ret_val = 0; u16 old_media_type = hw->media_type; - u32 advertising; if (netif_running(adapter->netdev)) { if (netif_msg_link(adapter)) @@ -3311,25 +3310,7 @@ static int atl1_set_link_ksettings(struct net_device *netdev, hw->media_type = MEDIA_TYPE_10M_HALF; } } - switch (hw->media_type) { - case MEDIA_TYPE_AUTO_SENSOR: - advertising = - ADVERTISED_10baseT_Half | - ADVERTISED_10baseT_Full | - ADVERTISED_100baseT_Half | - ADVERTISED_100baseT_Full | - ADVERTISED_1000baseT_Full | - ADVERTISED_Autoneg | ADVERTISED_TP; - break; - case MEDIA_TYPE_1000M_FULL: - advertising = - ADVERTISED_1000baseT_Full | - ADVERTISED_Autoneg | ADVERTISED_TP; - break; - default: - advertising = 0; - break; - } + if (atl1_phy_setup_autoneg_adv(hw)) { ret_val = -EINVAL; if (netif_msg_link(adapter)) |