[PATCH] i40e: Fix 32 bit shift compilation warnings
From: Joe Perches <joe@perches.com>
Date: 2013-08-31 01:47:39
Also in:
lkml
Subsystem:
intel ethernet drivers, networking drivers, the rest · Maintainers:
Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
When dma_addr_t is a 32 bit value, >> 32 emits compiler warnings Use ((addr>>16) >>16) to avoid this. I presume the macro should actually use the kernel.h macro upper_32_bits() eventually. Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/ethernet/intel/i40e/i40e_hmc.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_type.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.h b/drivers/net/ethernet/intel/i40e/i40e_hmc.h
index 745fb355..2f1b72f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_hmc.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.h@@ -123,7 +123,7 @@ struct i40e_hmc_info { #define I40E_SET_PF_SD_ENTRY(hw, pa, sd_index, type) \ { \ u32 val1, val2, val3; \ - val1 = (u32)((pa) >> sizeof(u32) * 8); \ + val1 = (u32)(I40E_HI_DWORD(pa)); \ val2 = (u32)(pa) | (I40E_HMC_MAX_BP_COUNT << \ I40E_PFHMC_SDDATALOW_PMSDBPCOUNT_SHIFT) | \ ((((type) == I40E_SD_TYPE_PAGED) ? 0 : 1) << \
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 36e35cc..4263cf7 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h@@ -78,8 +78,8 @@ typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *); #define I40E_ETH_LENGTH_OF_ADDRESS 6 /* Data type manipulation macros. */ -#define I40E_HI_DWORD(x) ((u32)(((x)>>32)&0xFFFFFFFF)) -#define I40E_LO_DWORD(x) ((u32)((x)&0xFFFFFFFF)) +#define I40E_HI_DWORD(x) ((u32)((((x) >> 16) >> 16) & 0xFFFFFFFF)) +#define I40E_LO_DWORD(x) ((u32)((x) & 0xFFFFFFFF)) #define I40E_HI_WORD(x) ((u16)(((x)>>16)&0xFFFF)) #define I40E_DESC_UNUSED(R) \