Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd31dd9d authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: use upper_32_bits/lower_32_bits where appropriate 



That's a bit nicer than open-coding it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 1c17627b

drivers/net/wireless/intel/iwlwifi/iwl-fh.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -647,7 +647,7 @@ struct iwl_rb_status { 




static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr)

static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr)

{

{

	return (sizeof(addr) > sizeof(u32) ? (addr >> 16) >> 16 : 0) & 0xF;

	return (sizeof(addr) > sizeof(u32) ? upper_32_bits(addr) : 0) & 0xF;

}

}

/**

/**

 * struct iwl_tfd_tb transmit buffer descriptor within transmit frame descriptor

 * struct iwl_tfd_tb transmit buffer descriptor within transmit frame descriptor

drivers/net/wireless/intel/iwlwifi/iwl-io.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -54,8 +54,8 @@ IWL_EXPORT_SYMBOL(iwl_write32); 
void iwl_write64(struct iwl_trans *trans, u64 ofs, u64 val)

void iwl_write64(struct iwl_trans *trans, u64 ofs, u64 val)

{

{

	trace_iwlwifi_dev_iowrite64(trans->dev, ofs, val);

	trace_iwlwifi_dev_iowrite64(trans->dev, ofs, val);

	iwl_trans_write32(trans, ofs, val & 0xffffffff);

	iwl_trans_write32(trans, ofs, lower_32_bits(val));

	iwl_trans_write32(trans, ofs + 4, val >> 32);

	iwl_trans_write32(trans, ofs + 4, upper_32_bits(val));

}

}

IWL_EXPORT_SYMBOL(iwl_write64);

IWL_EXPORT_SYMBOL(iwl_write64);