Merge commit 'spi/topic/sc18is602' into spi-linus

diff --combined drivers/spi/spi-sc18is602.c
index 1edffed9e098ee775a5ed7bbcc2b111fc796652d,c981d215b65bf27273dd7f63287f4cf981b999cd..121c2e1dea364f863cd4f66b832edfc367701eb8
--- 1/drivers/spi/spi-sc18is602.c
--- 2/drivers/spi/spi-sc18is602.c
+++ b/drivers/spi/spi-sc18is602.c
@@@ -183,18 -183,11 +183,11 @@@ static int sc18is602_setup_transfer(str
  static int sc18is602_check_transfer(struct spi_device *spi,
                                    struct spi_transfer *t, int tlen)
  {
-       int bpw;
        uint32_t hz;
  
        if (t && t->len + tlen > SC18IS602_BUFSIZ)
                return -EINVAL;
  
-       bpw = spi->bits_per_word;
-       if (t && t->bits_per_word)
-               bpw = t->bits_per_word;
-       if (bpw != 8)
-               return -EINVAL;
- 
        hz = spi->max_speed_hz;
        if (t && t->speed_hz)
                hz = t->speed_hz;
@@@ -254,6 -247,9 +247,6 @@@ error
  
  static int sc18is602_setup(struct spi_device *spi)
  {
 -      if (!spi->bits_per_word)
 -              spi->bits_per_word = 8;
 -
        if (spi->mode & ~(SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST))
                return -EINVAL;
  
@@@ -312,6 -308,7 +305,7 @@@ static int sc18is602_probe(struct i2c_c
        }
        master->bus_num = client->adapter->nr;
        master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST;
+       master->bits_per_word_mask = SPI_BPW_MASK(8);
        master->setup = sc18is602_setup;
        master->transfer_one_message = sc18is602_transfer_one;
        master->dev.of_node = np;