Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70806a7f authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: cleanup: do not assign a variable a value when not necessary 



Static analysis with cppcheck has shown a few instances of a variable
being reassigned a value before the old one has been used.  None of these
ever require the old value to be used so remove the old values.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 7dbbe5d5

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+4 −4
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw) 
static s32 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw)

{

	struct e1000_phy_info *phy = &hw->phy;

	s32 ret_val = 0;

	s32 ret_val;

	u16 phy_data, index;



	ret_val = e1e_rphy(hw, GG82563_PHY_DSP_DISTANCE, &phy_data);
@@ -1276,7 +1276,7 @@ static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, 
					   u16 *data)

{

	u32 kmrnctrlsta;

	s32 ret_val = 0;

	s32 ret_val;



	ret_val = e1000_acquire_mac_csr_80003es2lan(hw);

	if (ret_val)
@@ -1311,7 +1311,7 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, 
					    u16 data)

{

	u32 kmrnctrlsta;

	s32 ret_val = 0;

	s32 ret_val;



	ret_val = e1000_acquire_mac_csr_80003es2lan(hw);

	if (ret_val)
@@ -1335,7 +1335,7 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, 
 **/

static s32 e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw)

{

	s32 ret_val = 0;

	s32 ret_val;



	/* If there's an alternate MAC address place it in RAR0

	 * so that it will override the Si installed default perm

drivers/net/ethernet/intel/e1000e/82571.c

+3 −3
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ bool e1000_check_phy_82574(struct e1000_hw *hw) 
{

	u16 status_1kbt = 0;

	u16 receive_errors = 0;

	s32 ret_val = 0;

	s32 ret_val;



	/* Read PHY Receive Error counter first, if its is max - all F's then

	 * read the Base1000T status register If both are max then PHY is hung.
@@ -1542,7 +1542,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) 


	ctrl = er32(CTRL);

	status = er32(STATUS);

	rxcw = er32(RXCW);

	er32(RXCW);

	/* SYNCH bit and IV bit are sticky */

	udelay(10);

	rxcw = er32(RXCW);
@@ -1812,7 +1812,7 @@ static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw) 
static s32 e1000_read_mac_addr_82571(struct e1000_hw *hw)

{

	if (hw->mac.type == e1000_82571) {

		s32 ret_val = 0;

		s32 ret_val;



		/* If there's an alternate MAC address place it in RAR0

		 * so that it will override the Si installed default perm

drivers/net/ethernet/intel/e1000e/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ static int e1000_set_82571_fiber_loopback(struct e1000_adapter *adapter) 
{

	struct e1000_hw *hw = &adapter->hw;

	u32 ctrl = er32(CTRL);

	int link = 0;

	int link;



	/* special requirements for 82571/82572 fiber adapters */

drivers/net/ethernet/intel/e1000e/ich8lan.c

+5 −5
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) 
static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)

{

	struct e1000_phy_info *phy = &hw->phy;

	s32 ret_val = 0;

	s32 ret_val;



	phy->addr                     = 1;

	phy->reset_delay_us           = 100;
@@ -783,7 +783,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw) 
static s32 __e1000_access_emi_reg_locked(struct e1000_hw *hw, u16 address,

					 u16 *data, bool read)

{

	s32 ret_val = 0;

	s32 ret_val;



	ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR, address);

	if (ret_val)
@@ -1387,7 +1387,7 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw) 
	u32 strap = er32(STRAP);

	u32 freq = (strap & E1000_STRAP_SMT_FREQ_MASK) >>

	    E1000_STRAP_SMT_FREQ_SHIFT;

	s32 ret_val = 0;

	s32 ret_val;



	strap &= E1000_STRAP_SMBUS_ADDRESS_MASK;
@@ -1623,7 +1623,7 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link) 
 **/

s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)

{

	s32 ret_val = 0;

	s32 ret_val;

	u32 ctrl_reg = 0;

	u32 ctrl_ext = 0;

	u32 reg = 0;
@@ -2284,7 +2284,7 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw) 
 **/

static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active)

{

	s32 ret_val = 0;

	s32 ret_val;

	u16 oem_reg;



	ret_val = e1e_rphy(hw, HV_OEM_BITS, &oem_reg);

drivers/net/ethernet/intel/e1000e/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count) 
s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)

{

	u32 i;

	s32 ret_val = 0;

	s32 ret_val;

	u16 offset, nvm_alt_mac_addr_offset, nvm_data;

	u8 alt_mac_addr[ETH_ALEN];