Skip to content

Commit 6a864c0

Browse files
committed
Merge tag 'spi-fix-v6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fix from Mark Brown: "One simple fix for a minor but valid issue with constants overflowing identified via cppcheck" * tag 'spi-fix-v6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: sh-msiof: avoid integer overflow in constants
2 parents 4b561d1 + 6500ad2 commit 6a864c0

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/spi/spi-sh-msiof.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ struct sh_msiof_spi_priv {
136136

137137
/* SIFCTR */
138138
#define SIFCTR_TFWM_MASK GENMASK(31, 29) /* Transmit FIFO Watermark */
139-
#define SIFCTR_TFWM_64 (0 << 29) /* Transfer Request when 64 empty stages */
140-
#define SIFCTR_TFWM_32 (1 << 29) /* Transfer Request when 32 empty stages */
141-
#define SIFCTR_TFWM_24 (2 << 29) /* Transfer Request when 24 empty stages */
142-
#define SIFCTR_TFWM_16 (3 << 29) /* Transfer Request when 16 empty stages */
143-
#define SIFCTR_TFWM_12 (4 << 29) /* Transfer Request when 12 empty stages */
144-
#define SIFCTR_TFWM_8 (5 << 29) /* Transfer Request when 8 empty stages */
145-
#define SIFCTR_TFWM_4 (6 << 29) /* Transfer Request when 4 empty stages */
146-
#define SIFCTR_TFWM_1 (7 << 29) /* Transfer Request when 1 empty stage */
139+
#define SIFCTR_TFWM_64 (0UL << 29) /* Transfer Request when 64 empty stages */
140+
#define SIFCTR_TFWM_32 (1UL << 29) /* Transfer Request when 32 empty stages */
141+
#define SIFCTR_TFWM_24 (2UL << 29) /* Transfer Request when 24 empty stages */
142+
#define SIFCTR_TFWM_16 (3UL << 29) /* Transfer Request when 16 empty stages */
143+
#define SIFCTR_TFWM_12 (4UL << 29) /* Transfer Request when 12 empty stages */
144+
#define SIFCTR_TFWM_8 (5UL << 29) /* Transfer Request when 8 empty stages */
145+
#define SIFCTR_TFWM_4 (6UL << 29) /* Transfer Request when 4 empty stages */
146+
#define SIFCTR_TFWM_1 (7UL << 29) /* Transfer Request when 1 empty stage */
147147
#define SIFCTR_TFUA_MASK GENMASK(26, 20) /* Transmit FIFO Usable Area */
148148
#define SIFCTR_TFUA_SHIFT 20
149149
#define SIFCTR_TFUA(i) ((i) << SIFCTR_TFUA_SHIFT)

0 commit comments

Comments
 (0)