aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c4
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40evf_main.c4
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c1
-rw-r--r--drivers/net/ethernet/intel/igbvf/ethtool.c1
4 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index e0e5c6a867b1..c2587f5a501e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6836,7 +6836,6 @@ static void i40e_vsi_delete(struct i40e_vsi *vsi)
6836 return; 6836 return;
6837 6837
6838 i40e_aq_delete_element(&vsi->back->hw, vsi->seid, NULL); 6838 i40e_aq_delete_element(&vsi->back->hw, vsi->seid, NULL);
6839 return;
6840} 6839}
6841 6840
6842/** 6841/**
@@ -7576,8 +7575,6 @@ void i40e_veb_release(struct i40e_veb *veb)
7576 7575
7577 i40e_aq_delete_element(&pf->hw, veb->seid, NULL); 7576 i40e_aq_delete_element(&pf->hw, veb->seid, NULL);
7578 i40e_veb_clear(veb); 7577 i40e_veb_clear(veb);
7579
7580 return;
7581} 7578}
7582 7579
7583/** 7580/**
@@ -8058,7 +8055,6 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf)
8058 } 8055 }
8059 8056
8060 pf->queues_left = queues_left; 8057 pf->queues_left = queues_left;
8061 return;
8062} 8058}
8063 8059
8064/** 8060/**
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 6f6bd3f01801..8dbaa7798485 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -693,7 +693,6 @@ static void i40evf_del_vlan(struct i40evf_adapter *adapter, u16 vlan)
693 f->remove = true; 693 f->remove = true;
694 adapter->aq_required |= I40EVF_FLAG_AQ_DEL_VLAN_FILTER; 694 adapter->aq_required |= I40EVF_FLAG_AQ_DEL_VLAN_FILTER;
695 } 695 }
696 return;
697} 696}
698 697
699/** 698/**
@@ -1232,8 +1231,6 @@ void i40evf_reset_interrupt_capability(struct i40evf_adapter *adapter)
1232 pci_disable_msix(adapter->pdev); 1231 pci_disable_msix(adapter->pdev);
1233 kfree(adapter->msix_entries); 1232 kfree(adapter->msix_entries);
1234 adapter->msix_entries = NULL; 1233 adapter->msix_entries = NULL;
1235
1236 return;
1237} 1234}
1238 1235
1239/** 1236/**
@@ -2158,7 +2155,6 @@ err:
2158 return; /* do not reschedule */ 2155 return; /* do not reschedule */
2159 } 2156 }
2160 schedule_delayed_work(&adapter->init_task, HZ * 3); 2157 schedule_delayed_work(&adapter->init_task, HZ * 3);
2161 return;
2162} 2158}
2163 2159
2164/** 2160/**
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index bfcda8a455f4..0fbab80b0529 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2139,7 +2139,6 @@ void igb_set_fw_version(struct igb_adapter *adapter)
2139 } 2139 }
2140 break; 2140 break;
2141 } 2141 }
2142 return;
2143} 2142}
2144 2143
2145/** 2144/**
diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
index f58170bae18b..7d4e8559e2e9 100644
--- a/drivers/net/ethernet/intel/igbvf/ethtool.c
+++ b/drivers/net/ethernet/intel/igbvf/ethtool.c
@@ -119,7 +119,6 @@ static int igbvf_set_settings(struct net_device *netdev,
119static void igbvf_get_pauseparam(struct net_device *netdev, 119static void igbvf_get_pauseparam(struct net_device *netdev,
120 struct ethtool_pauseparam *pause) 120 struct ethtool_pauseparam *pause)
121{ 121{
122 return;
123} 122}
124 123
125static int igbvf_set_pauseparam(struct net_device *netdev, 124static int igbvf_set_pauseparam(struct net_device *netdev,