]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40evf: remove dead code
authorAlan Cox <alan@linux.intel.com>
Wed, 2 Mar 2016 00:02:15 +0000 (16:02 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 7 Jul 2016 17:40:41 +0000 (10:40 -0700)
Orabug: 23176970

The only error case is when the malloc fails, in which case the clean up
loop does nothing at all, so remove it

Signed-off-by: Alan Cox <alan@linux.intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 311f23e9a4314f62fed6c13e112c998b07e37e63)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/i40evf/i40evf_main.c

index 0e856e34a0281ebd107a9287ef953362a711fdb9..880bb06750dab7cd5e67d40205f9d55107786e94 100644 (file)
@@ -1507,7 +1507,7 @@ static int i40evf_alloc_q_vectors(struct i40evf_adapter *adapter)
        adapter->q_vectors = kcalloc(num_q_vectors, sizeof(*q_vector),
                                     GFP_KERNEL);
        if (!adapter->q_vectors)
-               goto err_out;
+               return -ENOMEM;
 
        for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
                q_vector = &adapter->q_vectors[q_idx];
@@ -1519,15 +1519,6 @@ static int i40evf_alloc_q_vectors(struct i40evf_adapter *adapter)
        }
 
        return 0;
-
-err_out:
-       while (q_idx) {
-               q_idx--;
-               q_vector = &adapter->q_vectors[q_idx];
-               netif_napi_del(&q_vector->napi);
-       }
-       kfree(adapter->q_vectors);
-       return -ENOMEM;
 }
 
 /**