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, 11 insertions, 21 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c
index c54caf6e5801..0d24b13ce763 100644
--- a/drivers/net/ethernet/intel/e1000e/manage.c
+++ b/drivers/net/ethernet/intel/e1000e/manage.c
@@ -140,7 +140,7 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
         /* No manageability, no filtering */
         if (!e1000e_check_mng_mode(hw)) {
                 hw->mac.tx_pkt_filtering = false;
-                goto out;
+                return hw->mac.tx_pkt_filtering;
         }
 
         /*
@@ -150,7 +150,7 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
         ret_val = e1000_mng_enable_host_if(hw);
         if (ret_val) {
                 hw->mac.tx_pkt_filtering = false;
-                goto out;
+                return hw->mac.tx_pkt_filtering;
         }
 
         /* Read in the header.  Length and offset are in dwords. */
@@ -170,16 +170,13 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
          */
         if ((hdr_csum != csum) || (hdr->signature != E1000_IAMT_SIGNATURE)) {
                 hw->mac.tx_pkt_filtering = true;
-                goto out;
+                return hw->mac.tx_pkt_filtering;
         }
 
         /* Cookie area is valid, make the final check for filtering. */
-        if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING)) {
+        if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING))
                 hw->mac.tx_pkt_filtering = false;
-                goto out;
-        }
 
-out:
         return hw->mac.tx_pkt_filtering;
 }
 
@@ -336,12 +333,11 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
 {
         u32 manc;
         u32 fwsm, factps;
-        bool ret_val = false;
 
         manc = er32(MANC);
 
         if (!(manc & E1000_MANC_RCV_TCO_EN))
-                goto out;
+                return false;
 
         if (hw->mac.has_fwsm) {
                 fwsm = er32(FWSM);
@@ -349,10 +345,8 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
 
                 if (!(factps & E1000_FACTPS_MNGCG) &&
                     ((fwsm & E1000_FWSM_MODE_MASK) ==
-                     (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT))) {
-                        ret_val = true;
-                        goto out;
-                }
+                     (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT)))
+                        return true;
         } else if ((hw->mac.type == e1000_82574) ||
                    (hw->mac.type == e1000_82583)) {
                 u16 data;
@@ -362,16 +356,12 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
 
                 if (!(factps & E1000_FACTPS_MNGCG) &&
                     ((data & E1000_NVM_INIT_CTRL2_MNGM) ==
-                     (e1000_mng_mode_pt << 13))) {
-                        ret_val = true;
-                        goto out;
-                }
+                     (e1000_mng_mode_pt << 13)))
+                        return true;
         } else if ((manc & E1000_MANC_SMBUS_EN) &&
                    !(manc & E1000_MANC_ASF_EN)) {
-                ret_val = true;
-                goto out;
+                return true;
         }
 
-out:
-        return ret_val;
+        return false;
 }