e1000: 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/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
index 75f3fd1d8d6ee59e27234a1ee6a0faf131e9ffc8..ea6ccf4b728be71f42ce9e547e63e2922b7e1e27 100644 (file)
--- a/drivers/net/ethernet/intel/e1000/e1000.h
+++ b/drivers/net/ethernet/intel/e1000/e1000.h
@@ -116,7 +116,7 @@ struct e1000_adapter;
 #define E1000_MASTER_SLAVE     e1000_ms_hw_default
 #endif
 
-#define E1000_MNG_VLAN_NONE    (-1)
+#define E1000_MNG_VLAN_NONE    0xFFFF
 
 /* wrapper around a pointer to a socket buffer,
  * so a DMA handle can be stored along with the buffer

diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index d06d29c6c0370d222c91e30cf6dee53c10c7d53a..726365c567ef3373b840666ab24bddf5d0ad88b4 100644 (file)
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -806,7 +806,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)EEPROM_SUM) && !(*data))
+       if (checksum != EEPROM_SUM && !(*data))
                *data = 2;
 
        return *data;

diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
index f9328f2e669f8bd64d18bb9f7490dfab68493c06..0e5de52b106702d540b0234e236f404a2c174685 100644 (file)
--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c
@@ -3970,7 +3970,7 @@ s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw)
                return E1000_SUCCESS;
 
 #endif
-       if (checksum == (u16)EEPROM_SUM)
+       if (checksum == EEPROM_SUM)
                return E1000_SUCCESS;
        else {
                e_dbg("EEPROM Checksum Invalid\n");
@@ -3997,7 +3997,7 @@ s32 e1000_update_eeprom_checksum(struct e1000_hw *hw)
                }
                checksum += eeprom_data;
        }
-       checksum = (u16)EEPROM_SUM - checksum;
+       checksum = EEPROM_SUM - checksum;
        if (e1000_write_eeprom(hw, EEPROM_CHECKSUM_REG, 1, &checksum) < 0) {
                e_dbg("EEPROM Write Error\n");
                return -E1000_ERR_EEPROM;

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index d8595e84326dbc757da18318bcb3b1458bb3f9ff..292389aceb2d4abf0c824877c42061168ed3d43e 100644 (file)
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -313,8 +313,7 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
                } else {
                        adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
                }
-               if ((old_vid != (u16)E1000_MNG_VLAN_NONE) &&
-                   (vid != old_vid) &&
+               if (old_vid != E1000_MNG_VLAN_NONE && vid != old_vid &&
                    !test_bit(old_vid, adapter->active_vlans))
                        e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),
                                               old_vid);