e1000e: cleanup: remove unnecessary assignments just before returning

Just return the appropriate value.

(cherry picked from commit 7eb61d81946ccb61726600c6e8ceefcce9844f02)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/e1000e/80003es2lan.c b/drivers/net/e1000e/80003es2lan.c
index f13ce84af4105847a3919b46e7cd63281e279635..86116c4eaf7688a2f659ebb387b18bd01ec94130 100644 (file)
--- a/drivers/net/e1000e/80003es2lan.c
+++ b/drivers/net/e1000e/80003es2lan.c
@@ -470,9 +470,8 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
 
                if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
-                       ret_val = -E1000_ERR_PHY;
                        e1000_release_phy_80003es2lan(hw);
-                       return ret_val;
+                       return -E1000_ERR_PHY;
                }
 
                udelay(200);
@@ -804,9 +803,7 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
        ew32(IMC, 0xffffffff);
        er32(ICR);
 
-       ret_val = e1000_check_alt_mac_addr_generic(hw);
-
-       return ret_val;
+       return e1000_check_alt_mac_addr_generic(hw);
 }
 
 /**
@@ -1265,9 +1262,8 @@ static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
        } while ((reg_data != reg_data2) && (i < GG82563_MAX_KMRN_RETRY));
 
        reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-       ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
 
-       return ret_val;
+       return e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
 }
 
 /**

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index af63e1579142e61ea6118470e2d0f82b1f0bee34..bb1fff9affe4998e56c5c115d195e929da79d34d 100644 (file)
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -1497,9 +1497,7 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
        if (ret_val)
                return ret_val;
 
-       ret_val = e1000e_setup_copper_link(hw);
-
-       return ret_val;
+       return e1000e_setup_copper_link(hw);
 }
 
 /**

diff --git a/drivers/net/e1000e/mac.c b/drivers/net/e1000e/mac.c
index 83f93684dc2f8b581ead181b285a563be838e40f..ce8a55a584be9048e26d50813ee21f81e7650ec1 100644 (file)
--- a/drivers/net/e1000e/mac.c
+++ b/drivers/net/e1000e/mac.c
@@ -458,10 +458,8 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
         * If we are forcing speed/duplex, then we simply return since
         * we have already determined whether we have link or not.
         */
-       if (!mac->autoneg) {
-               ret_val = -E1000_ERR_CONFIG;
-               return ret_val;
-       }
+       if (!mac->autoneg)
+               return -E1000_ERR_CONFIG;
 
        /*
         * Auto-Neg is enabled.  Auto Speed Detection takes care

diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 70e8eb6d49d8b2aadaac547d2995bc8ebf7fa67e..323cb145f84979ce846bbb772e472df6f7759561 100644 (file)
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -1064,8 +1064,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
                break;
        default:
                e_dbg("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               return ret_val;
+               return -E1000_ERR_CONFIG;
        }
 
        ret_val = e1e_wphy(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);