diff options
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb_nl.c | 1 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_ethtool.c | 4 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 5 |
3 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c index dd4883f642be..71da325dfa80 100644 --- a/drivers/net/ixgbe/ixgbe_dcb_nl.c +++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c | |||
@@ -488,7 +488,6 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state) | |||
488 | if (adapter->temp_dcb_cfg.pfc_mode_enable != | 488 | if (adapter->temp_dcb_cfg.pfc_mode_enable != |
489 | adapter->dcb_cfg.pfc_mode_enable) | 489 | adapter->dcb_cfg.pfc_mode_enable) |
490 | adapter->dcb_set_bitmap |= BIT_PFC; | 490 | adapter->dcb_set_bitmap |= BIT_PFC; |
491 | return; | ||
492 | } | 491 | } |
493 | 492 | ||
494 | /** | 493 | /** |
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index dc7fd5b70bc3..251767d9fe79 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c | |||
@@ -1493,8 +1493,6 @@ static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter) | |||
1493 | tx_ring->tx_buffer_info = NULL; | 1493 | tx_ring->tx_buffer_info = NULL; |
1494 | kfree(rx_ring->rx_buffer_info); | 1494 | kfree(rx_ring->rx_buffer_info); |
1495 | rx_ring->rx_buffer_info = NULL; | 1495 | rx_ring->rx_buffer_info = NULL; |
1496 | |||
1497 | return; | ||
1498 | } | 1496 | } |
1499 | 1497 | ||
1500 | static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) | 1498 | static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) |
@@ -1973,8 +1971,6 @@ static void ixgbe_get_wol(struct net_device *netdev, | |||
1973 | wol->wolopts |= WAKE_BCAST; | 1971 | wol->wolopts |= WAKE_BCAST; |
1974 | if (adapter->wol & IXGBE_WUFC_MAG) | 1972 | if (adapter->wol & IXGBE_WUFC_MAG) |
1975 | wol->wolopts |= WAKE_MAGIC; | 1973 | wol->wolopts |= WAKE_MAGIC; |
1976 | |||
1977 | return; | ||
1978 | } | 1974 | } |
1979 | 1975 | ||
1980 | static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | 1976 | static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 3fb9f23c7502..926ad8c2f2c7 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1615,8 +1615,6 @@ static void ixgbe_set_itr_msix(struct ixgbe_q_vector *q_vector) | |||
1615 | 1615 | ||
1616 | ixgbe_write_eitr(q_vector); | 1616 | ixgbe_write_eitr(q_vector); |
1617 | } | 1617 | } |
1618 | |||
1619 | return; | ||
1620 | } | 1618 | } |
1621 | 1619 | ||
1622 | static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr) | 1620 | static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr) |
@@ -2180,8 +2178,6 @@ static void ixgbe_set_itr(struct ixgbe_adapter *adapter) | |||
2180 | 2178 | ||
2181 | ixgbe_write_eitr(q_vector); | 2179 | ixgbe_write_eitr(q_vector); |
2182 | } | 2180 | } |
2183 | |||
2184 | return; | ||
2185 | } | 2181 | } |
2186 | 2182 | ||
2187 | /** | 2183 | /** |
@@ -4466,7 +4462,6 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter) | |||
4466 | adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED; | 4462 | adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED; |
4467 | pci_disable_msi(adapter->pdev); | 4463 | pci_disable_msi(adapter->pdev); |
4468 | } | 4464 | } |
4469 | return; | ||
4470 | } | 4465 | } |
4471 | 4466 | ||
4472 | /** | 4467 | /** |