From: Jacob Keller Date: Thu, 12 Mar 2020 01:58:10 +0000 (-0700) Subject: ice: use __le16 types for explicitly Little Endian values X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2efefb56f92689b2e216857834df69dd3ea47d2b;p=linux.git ice: use __le16 types for explicitly Little Endian values The ice_read_sr_aq function returns words in the Little Endian format. Remove the need for __force and typecasting by using a local variable in the ice_read_sr_word_aq function. Additionally clarify explicitly that the ice_read_sr_aq function takes storage for __le16 values instead of using u16. Being explicit about the endianness of this data helps when using tools like sparse to catch endian-related issues. Signed-off-by: Jacob Keller Reviewed-by: Jesse Brandeburg Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c index f6e25db22c235..5597ec50a6625 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c @@ -80,13 +80,14 @@ ice_check_sr_access_params(struct ice_hw *hw, u32 offset, u16 words) * @hw: pointer to the HW structure * @offset: offset in words from module start * @words: number of words to read - * @data: buffer for words reads from Shadow RAM + * @data: storage for the words read from Shadow RAM (Little Endian) * @last_command: tells the AdminQ that this is the last command * - * Reads 16-bit word buffers from the Shadow RAM using the admin command. + * Reads 16-bit Little Endian word buffers from the Shadow RAM using the admin + * command. */ static enum ice_status -ice_read_sr_aq(struct ice_hw *hw, u32 offset, u16 words, u16 *data, +ice_read_sr_aq(struct ice_hw *hw, u32 offset, u16 words, __le16 *data, bool last_command) { enum ice_status status; @@ -116,10 +117,11 @@ static enum ice_status ice_read_sr_word_aq(struct ice_hw *hw, u16 offset, u16 *data) { enum ice_status status; + __le16 data_local; - status = ice_read_sr_aq(hw, offset, 1, data, true); + status = ice_read_sr_aq(hw, offset, 1, &data_local, true); if (!status) - *data = le16_to_cpu(*(__force __le16 *)data); + *data = le16_to_cpu(data_local); return status; }