e1000e: cleanup goto statements to exit points without common work

Per ./Documentation/CodingStyle, goto statements are acceptable for the
centralized exiting of functions when there are multiple exit points which
share common work such as cleanup.  When no common work is required for
multiple exit points, the function should just return at these exit points
instead of doing an unnecessary jump to a centralized return.  This patch
cleans up the inappropriate use of goto statements, and removes unnecessary
variables (or move to a smaller scope) where possible as a result of the
cleanups.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index c11b40b81acf..c079b9b0810d 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1985,7 +1985,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
                           e1000_intr_msix_rx, 0, adapter->rx_ring->name,
                           netdev);
         if (err)
-                goto out;
+                return err;
         adapter->rx_ring->itr_register = adapter->hw.hw_addr +
             E1000_EITR_82574(vector);
         adapter->rx_ring->itr_val = adapter->itr;
@@ -2001,7 +2001,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
                           e1000_intr_msix_tx, 0, adapter->tx_ring->name,
                           netdev);
         if (err)
-                goto out;
+                return err;
         adapter->tx_ring->itr_register = adapter->hw.hw_addr +
             E1000_EITR_82574(vector);
         adapter->tx_ring->itr_val = adapter->itr;
@@ -2010,12 +2010,11 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
         err = request_irq(adapter->msix_entries[vector].vector,
                           e1000_msix_other, 0, netdev->name, netdev);
         if (err)
-                goto out;
+                return err;
 
         e1000_configure_msix(adapter);
+
         return 0;
-out:
-        return err;
 }
 
 /**
@@ -2367,7 +2366,7 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
         unsigned int retval = itr_setting;
 
         if (packets == 0)
-                goto update_itr_done;
+                return itr_setting;
 
         switch (itr_setting) {
         case lowest_latency:
@@ -2402,7 +2401,6 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
                 break;
         }
 
-update_itr_done:
         return retval;
 }