| Message ID | 20190313210118.3507256-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 6d85028134d3f4f946924e2f9f0aaff47d9de840 |
| Headers | show |
| Series | spi: fix SPI_BPW_RANGE_MASK() regression | expand |
On Wed, Mar 13, 2019 at 10:01 PM Arnd Bergmann <arnd@arndb.de> wrote: > Geert points out that I confused the min/max arguments that are > reversed between SPI_BPW_RANGE_MASK() and GENMASK(). This time > I have verified the result of the macro after fixing the arguments. > > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Fixes: eefffb42f665 ("spi: work around clang bug in SPI_BPW_RANGE_MASK()") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index b27386450089..a0975cf76cf6 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -444,7 +444,7 @@ struct spi_controller { /* bitmask of supported bits_per_word for transfers */ u32 bits_per_word_mask; #define SPI_BPW_MASK(bits) BIT((bits) - 1) -#define SPI_BPW_RANGE_MASK(min, max) GENMASK((min) - 1, (max) - 1) +#define SPI_BPW_RANGE_MASK(min, max) GENMASK((max) - 1, (min) - 1) /* limits on transfer speed */ u32 min_speed_hz;
Geert points out that I confused the min/max arguments that are reversed between SPI_BPW_RANGE_MASK() and GENMASK(). This time I have verified the result of the macro after fixing the arguments. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Fixes: eefffb42f665 ("spi: work around clang bug in SPI_BPW_RANGE_MASK()") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- The broken commit is currently in the for-5.2 branch of the spi tree. If this is a branch that gets rebased, please just fold this fix into the original patch --- include/linux/spi/spi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0