e1000e: 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 E1000_MNG_VLAN_NONE with resulting value
rather than casting -1 to u16.

Signed-off-by: Jacek Kowalski <jacek@jacekk.info>
Suggested-by: Simon Horman <horms@kernel.org>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 952898151565f2c0c8154332bcea74eca636bc34..018e61aea787d01f40560edf39bb277ac256500a 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -64,7 +64,7 @@ struct e1000_info;
 #define AUTO_ALL_MODES                 0
 #define E1000_EEPROM_APME              0x0400
 
-#define E1000_MNG_VLAN_NONE            (-1)
+#define E1000_MNG_VLAN_NONE            0xFFFF
 
 #define DEFAULT_JUMBO                  9234
 

diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index c0bbb12eed2e97bbc768e62d00493592ced12092..06482ad5050881938155589a2b80b278eb0d48ff 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -959,7 +959,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
        }
 
        /* If Checksum is not Correct return error else test passed */
-       if ((checksum != (u16)NVM_SUM) && !(*data))
+       if (checksum != NVM_SUM && !(*data))
                *data = 2;
 
        return *data;

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index b27a61fab371724dca5b0a20d0e2da91da7f9ea4..201322dac2330587ec9eb03dd3e323ee76b99730 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2761,7 +2761,7 @@ static void e1000e_vlan_filter_disable(struct e1000_adapter *adapter)
                rctl &= ~(E1000_RCTL_VFE | E1000_RCTL_CFIEN);
                ew32(RCTL, rctl);
 
-               if (adapter->mng_vlan_id != (u16)E1000_MNG_VLAN_NONE) {
+               if (adapter->mng_vlan_id != E1000_MNG_VLAN_NONE) {
                        e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
                                               adapter->mng_vlan_id);
                        adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
@@ -2828,7 +2828,7 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
                adapter->mng_vlan_id = vid;
        }
 
-       if ((old_vid != (u16)E1000_MNG_VLAN_NONE) && (vid != old_vid))
+       if (old_vid != E1000_MNG_VLAN_NONE && vid != old_vid)
                e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q), old_vid);
 }
 

diff --git a/drivers/net/ethernet/intel/e1000e/nvm.c b/drivers/net/ethernet/intel/e1000e/nvm.c
index 16369e6d245a4a40b454eedc27e9ecc7e45fc839..4bde1c9de1b94a96dfe0a2dc7ed960b0afcc9dfe 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/nvm.c
+++ b/drivers/net/ethernet/intel/e1000e/nvm.c
@@ -564,7 +564,7 @@ s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw)
                return 0;
        }
 
-       if (checksum != (u16)NVM_SUM) {
+       if (checksum != NVM_SUM) {
                e_dbg("NVM Checksum Invalid\n");
                return -E1000_ERR_NVM;
        }
@@ -594,7 +594,7 @@ s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw)
                }
                checksum += nvm_data;
        }
-       checksum = (u16)NVM_SUM - checksum;
+       checksum = NVM_SUM - checksum;
        ret_val = e1000_write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum);
        if (ret_val)
                e_dbg("NVM Write Error while updating checksum.\n");