> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf
> Of Jacek Kowalski
> Sent: Wednesday, July 23, 2025 10:55 AM
> To: Nguyen, Anthony L <[email protected]>; Kitszel,
> Przemyslaw <[email protected]>; Andrew Lunn
> <[email protected]>; David S. Miller <[email protected]>; Eric
> Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo
> Abeni <[email protected]>; Simon Horman <[email protected]>
> Cc: [email protected]; [email protected]
> Subject: [Intel-wired-lan] [PATCH iwl-next v3 2/5] 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 <[email protected]>
> Suggested-by: Simon Horman <[email protected]>
Reviewed-by: Aleksandr Loktionov <[email protected]>
> ---
> drivers/net/ethernet/intel/e1000e/e1000.h | 2 +-
> drivers/net/ethernet/intel/e1000e/ethtool.c | 2 +-
> drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++--
> drivers/net/ethernet/intel/e1000e/nvm.c | 4 ++--
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h
> b/drivers/net/ethernet/intel/e1000e/e1000.h
> index 952898151565..018e61aea787 100644
> --- 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 c0bbb12eed2e..06482ad50508 100644
> --- 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 7719e15813ee..58cfc63e95ac 100644
> --- 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 16369e6d245a..4bde1c9de1b9 100644
> --- 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");
> --
> 2.47.2
