OSDN Git Service

i40e: make i40evf_map_rings_to_vectors void
authorMitch Williams <mitch.a.williams@intel.com>
Tue, 22 Aug 2017 10:57:51 +0000 (06:57 -0400)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 2 Oct 2017 19:46:35 +0000 (12:46 -0700)
This function cannot fail, so why is it returning a value? And why are
we checking it? Why shouldn't we just make it void? Why is this commit
message made up of only questions?

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40evf/i40evf_main.c

index 8c513ce..f2f1e75 100644 (file)
@@ -430,12 +430,11 @@ i40evf_map_vector_to_txq(struct i40evf_adapter *adapter, int v_idx, int t_idx)
  * group the rings as "efficiently" as possible.  You would add new
  * mapping configurations in here.
  **/
-static int i40evf_map_rings_to_vectors(struct i40evf_adapter *adapter)
+static void i40evf_map_rings_to_vectors(struct i40evf_adapter *adapter)
 {
        int rings_remaining = adapter->num_active_queues;
        int ridx = 0, vidx = 0;
        int q_vectors;
-       int err = 0;
 
        q_vectors = adapter->num_msix_vectors - NONQ_VECS;
 
@@ -451,8 +450,6 @@ static int i40evf_map_rings_to_vectors(struct i40evf_adapter *adapter)
        }
 
        adapter->aq_required |= I40EVF_FLAG_AQ_MAP_VECTORS;
-
-       return err;
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -1578,9 +1575,7 @@ static int i40evf_reinit_interrupt_scheme(struct i40evf_adapter *adapter)
 
        set_bit(__I40E_VSI_DOWN, adapter->vsi.state);
 
-       err = i40evf_map_rings_to_vectors(adapter);
-       if (err)
-               goto err;
+       i40evf_map_rings_to_vectors(adapter);
 
        if (RSS_AQ(adapter))
                adapter->aq_required |= I40EVF_FLAG_AQ_CONFIGURE_RSS;