spi: fix SPI_BIT_MASK() to use correct size for 32-bit transfer mask
PATCH 1/1 spi: fix SPI_BIT_MASK() to use correct size for 32-bit transfer mask
When building a 64-bit kernel we get the following warning from the compiler:
drivers/spi/spi-pxa2xx.c: In function ‘pxa2xx_spi_probe’:
drivers/spi/spi-pxa2xx.c:1152:3: warning: large integer implicitly truncated to unsigned type [-Woverflow]
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
^
This is due the fact that when the max range is specified as 32SPI_BIT_MASK() expands to ~0UL which doesn't fit to the u32 type that the master->bits_per_word_mask is.
Fix this by using ~0U instead.
--- include/linux/spi/spi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/spi/spi.h +1 -1
@@ -309,7 +309,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))/* other constraints relevant to this driver */
Signature · 1 line
1.8.4.rc2
Quoted 5 lines · Mika Westerberg
When building a 64-bit kernel we get the following warning from the compiler:
drivers/spi/spi-pxa2xx.c: In function ‘pxa2xx_spi_probe’:
drivers/spi/spi-pxa2xx.c:1152:3: warning: large integer implicitly truncated to unsigned type [-Woverflow]
Quoted 7 lines
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32); ^This is due the fact that when the max range is specified as 32
SPI_BIT_MASK()expands to ~0UL which doesn't fit to the u32 type that themaster->bits_per_word_maskis.Fix this by using ~0U instead.
The same patch is already in next-20130819 at least, as:
b6aa23c spi: fix SPI_BIT_MASK so it always fits into 32-bits
Quoted 12 lines · Stephen Warren
Quoted 11 lines · Mika Westerberg
When building a 64-bit kernel we get the following warning from the compiler:
drivers/spi/spi-pxa2xx.c: In function ‘pxa2xx_spi_probe’:
drivers/spi/spi-pxa2xx.c:1152:3: warning: large integer implicitly truncated to unsigned type [-Woverflow]master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32); ^This is due the fact that when the max range is specified as 32
SPI_BIT_MASK()expands to ~0UL which doesn't fit to the u32 type that themaster->bits_per_word_maskis.
Quoted 4 lines
Quoted 1 line
Fix this by using ~0U instead.
The same patch is already in next-20130819 at least, as:
b6aa23c spi: fixSPI_BIT_MASKso it always fits into 32-bits
Cool :) Thanks for letting me know.