Commit b45d082d authored by Jacek Kowalski's avatar Jacek Kowalski Committed by Tony Nguyen
Browse files

igb: drop unnecessary constant casts to u16 



Remove unnecessary casts of constant values to u16.
C's integer promotion rules make them ints no matter what.

Additionally replace IGB_MNG_VLAN_NONE with resulting value
rather than casting -1 to u16.

Signed-off-by: default avatarJacek Kowalski <jacek@jacekk.info>
Suggested-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 7e931364

drivers/net/ethernet/intel/igb/e1000_82575.c

+2 −2
Original line number Diff line number Diff line
@@ -2372,7 +2372,7 @@ static s32 igb_validate_nvm_checksum_with_offset(struct e1000_hw *hw, 
		checksum += nvm_data;

	}



	if (checksum != (u16) NVM_SUM) {

	if (checksum != NVM_SUM) {

		hw_dbg("NVM Checksum Invalid\n");

		ret_val = -E1000_ERR_NVM;

		goto out;
@@ -2406,7 +2406,7 @@ static s32 igb_update_nvm_checksum_with_offset(struct e1000_hw *hw, u16 offset) 
		}

		checksum += nvm_data;

	}

	checksum = (u16) NVM_SUM - checksum;

	checksum = NVM_SUM - checksum;

	ret_val = hw->nvm.ops.write(hw, (NVM_CHECKSUM_REG + offset), 1,

				&checksum);

	if (ret_val)

drivers/net/ethernet/intel/igb/e1000_i210.c

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static s32 igb_update_nvm_checksum_i210(struct e1000_hw *hw) 
			}

			checksum += nvm_data;

		}

		checksum = (u16) NVM_SUM - checksum;

		checksum = NVM_SUM - checksum;

		ret_val = igb_write_nvm_srwr(hw, NVM_CHECKSUM_REG, 1,

						&checksum);

		if (ret_val) {

drivers/net/ethernet/intel/igb/e1000_nvm.c

+2 −2
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ s32 igb_validate_nvm_checksum(struct e1000_hw *hw) 
		checksum += nvm_data;

	}



	if (checksum != (u16) NVM_SUM) {

	if (checksum != NVM_SUM) {

		hw_dbg("NVM Checksum Invalid\n");

		ret_val = -E1000_ERR_NVM;

		goto out;
@@ -668,7 +668,7 @@ s32 igb_update_nvm_checksum(struct e1000_hw *hw) 
		}

		checksum += nvm_data;

	}

	checksum = (u16) NVM_SUM - checksum;

	checksum = NVM_SUM - checksum;

	ret_val = hw->nvm.ops.write(hw, NVM_CHECKSUM_REG, 1, &checksum);

	if (ret_val)

		hw_dbg("NVM Write Error while updating checksum.\n");

drivers/net/ethernet/intel/igb/igb.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static inline int igb_skb_pad(void) 
#define IGB_MASTER_SLAVE	e1000_ms_hw_default

#endif



#define IGB_MNG_VLAN_NONE	-1

#define IGB_MNG_VLAN_NONE	0xFFFF



enum igb_tx_flags {

	/* cmd_type flags */

drivers/net/ethernet/intel/igb/igb_main.c

+1 −2
Original line number Diff line number Diff line
@@ -1531,8 +1531,7 @@ static void igb_update_mng_vlan(struct igb_adapter *adapter) 
		adapter->mng_vlan_id = IGB_MNG_VLAN_NONE;

	}



	if ((old_vid != (u16)IGB_MNG_VLAN_NONE) &&

	    (vid != old_vid) &&

	if (old_vid != IGB_MNG_VLAN_NONE && vid != old_vid &&

	    !test_bit(old_vid, adapter->active_vlans)) {

		/* remove VID from filter table */

		igb_vfta_set(hw, vid, pf_id, false, true);