diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:48:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:48:46 +0100 |
| commit | 8e28fb63a7dfd55085b42e0acb5d9d0d2911ecbd (patch) | |
| tree | 2a7474ddb922494e36127a1fc2face0fe0c038b5 | |
| parent | Merge remote-tracking branch 'spi/topic/blackfin-v3' into spi-next (diff) | |
| parent | spi: fix SPI_BIT_MASK so it always fits into 32-bits (diff) | |
| download | linux-8e28fb63a7dfd55085b42e0acb5d9d0d2911ecbd.tar.gz linux-8e28fb63a7dfd55085b42e0acb5d9d0d2911ecbd.zip | |
Merge remote-tracking branch 'spi/topic/bpw' into spi-next
| -rw-r--r-- | include/linux/spi/spi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 28e440be1c07..c920c2f4dad5 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -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 */ |