iwlwifi: use upper_32_bits/lower_32_bits where appropriate

jmberg-intel · lucacoelho · commit bd31dd9d147a · 2017-04-11T14:54:34.000+03:00
That's a bit nicer than open-coding it.

Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
Signed-off-by: Luca Coelho &lt;luciano.coelho@intel.com&gt;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-fh.h b/drivers/net/wireless/intel/iwlwifi/iwl-fh.h
@@ -647,7 +647,7 @@ struct iwl_rb_status {
 
 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
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -54,8 +54,8 @@ IWL_EXPORT_SYMBOL(iwl_write32);
 void iwl_write64(struct iwl_trans *trans, u64 ofs, u64 val)
 {
 	trace_iwlwifi_dev_iowrite64(trans->dev, ofs, val);
-	iwl_trans_write32(trans, ofs, val & 0xffffffff);
-	iwl_trans_write32(trans, ofs + 4, val >> 32);
+	iwl_trans_write32(trans, ofs, lower_32_bits(val));
+	iwl_trans_write32(trans, ofs + 4, upper_32_bits(val));
 }
 IWL_EXPORT_SYMBOL(iwl_write64);
 

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ struct iwl_rb_status {`
`647`	`647`
`648`	`648`	`static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr)`
`649`	`649`	`{`
`650`		`- return (sizeof(addr) > sizeof(u32) ? (addr >> 16) >> 16 : 0) & 0xF;`
	`650`	`+ return (sizeof(addr) > sizeof(u32) ? upper_32_bits(addr) : 0) & 0xF;`
`651`	`651`	`}`
`652`	`652`	`/**`
`653`	`653`	`* struct iwl_tfd_tb transmit buffer descriptor within transmit frame descriptor`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ IWL_EXPORT_SYMBOL(iwl_write32);`
`54`	`54`	`void iwl_write64(struct iwl_trans *trans, u64 ofs, u64 val)`
`55`	`55`	`{`
`56`	`56`	`trace_iwlwifi_dev_iowrite64(trans->dev, ofs, val);`
`57`		`- iwl_trans_write32(trans, ofs, val & 0xffffffff);`
`58`		`- iwl_trans_write32(trans, ofs + 4, val >> 32);`
	`57`	`+ iwl_trans_write32(trans, ofs, lower_32_bits(val));`
	`58`	`+ iwl_trans_write32(trans, ofs + 4, upper_32_bits(val));`
`59`	`59`	`}`
`60`	`60`	`IWL_EXPORT_SYMBOL(iwl_write64);`
`61`	`61`