diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-23 13:14:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-23 13:14:15 +0000 |
| commit | 8b8b773e6b611e6629ac01f85d401c949d153546 (patch) | |
| tree | 9298bc5278591d6b33e876de4d4c2c1889130584 | |
| parent | 341e6df6c887b1101970908d33c110fb32688d8c (diff) | |
| parent | 463654cec26466a03615974444d6900f1cd0eeb9 (diff) | |
| download | op-kernel-dev-8b8b773e6b611e6629ac01f85d401c949d153546.zip op-kernel-dev-8b8b773e6b611e6629ac01f85d401c949d153546.tar.gz | |
Merge commit 'spi/topic/sc18is602' into spi-linus
| -rw-r--r-- | drivers/spi/spi-sc18is602.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/spi/spi-sc18is602.c b/drivers/spi/spi-sc18is602.c index 1edffed..121c2e1 100644 --- a/drivers/spi/spi-sc18is602.c +++ b/drivers/spi/spi-sc18is602.c @@ -183,18 +183,11 @@ static int sc18is602_setup_transfer(struct sc18is602 *hw, u32 hz, u8 mode) 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; @@ -312,6 +305,7 @@ static int sc18is602_probe(struct i2c_client *client, } 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; |
