[PATCH] spi: fix SPI_BIT_MASK so it always fits into 32-bits

[PATCH] spi: fix SPI_BIT_MASK so it always fits into 32-bits

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

On a 64-bit platform, ~0UL fills 64-bits, which causes SPI_BIT_MASK(32)
not to fit into 32 bits. This causes a warning when the result is assigned
to a 32-bit variable. Use ~0U instead to prevent this. This fixes:

drivers/spi/spi-gpio.c: In function 'spi_gpio_probe':
drivers/spi/spi-gpio.c:446:2: warning: large integer implicitly truncated to unsigned type [-Woverflow]

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 include/linux/spi/spi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index c28ac12..8515190 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -314,7 +314,7 @@ struct spi_master {
 	/* bitmask of supported bits_per_word for transfers */
 	u32			bits_per_word_mask;
 #define SPI_BPW_MASK(bits) BIT((bits) - 1)
-#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0UL : (BIT(bits) - 1))
+#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0U : (BIT(bits) - 1))
 #define SPI_BPW_RANGE_MASK(min, max) (SPI_BIT_MASK(max) - SPI_BIT_MASK(min - 1))
 
 	/* limits on transfer speed */
-- 
1.8.1.5

Re: [PATCH] spi: fix SPI_BIT_MASK so it always fits into 32-bits

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

On Thu, Aug 01, 2013 at 04:08:57PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> On a 64-bit platform, ~0UL fills 64-bits, which causes SPI_BIT_MASK(32)
> not to fit into 32 bits. This causes a warning when the result is assigned
> to a 32-bit variable. Use ~0U instead to prevent this. This fixes:

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]