diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-10-14 23:12:20 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-19 22:32:01 +0300 |
| commit | 863cb2f72e636c8721482fd88e256facb59c5737 (patch) | |
| tree | 76c80f8b30ae3866c36808edba94ec5e74aeb599 | |
| parent | 4adb1f8f880081ee9921ebd399786387e0cd6f52 (diff) | |
| download | linux-863cb2f72e636c8721482fd88e256facb59c5737.tar.xz | |
spi: dw: remove bits_per_word member of struct chip_data
There is no need to carry over spi->bits_per_word and Co from ->setup() in
struct chip_data since ->transfer_one() will anyway take the transfer
parameters from struct spi_transfer. This is since SPI core validates both
bits_per_word transfer parameter and defaults to spi->bits_per_word in case
that per transfer parameter is not set.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/spi/spi-dw.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index c769c2a5da16..c8f7f161213d 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -31,17 +31,14 @@ /* Slave spi_dev related */ struct chip_data { u8 cs; /* chip select pin */ - u8 n_bytes; /* current is a 1/2/4 byte op */ u8 tmode; /* TR/TO/RO/EEPROM */ u8 type; /* SPI/SSP/MicroWire */ u8 poll_mode; /* 1 means use poll mode */ - u32 dma_width; u32 rx_threshold; u32 tx_threshold; u8 enable_dma; - u8 bits_per_word; u16 clk_div; /* baud rate divider */ u32 speed_hz; /* baud rate */ void (*cs_control)(u32 command); @@ -294,8 +291,6 @@ static int dw_spi_transfer_one(struct spi_master *master, int ret; dws->dma_mapped = 0; - dws->n_bytes = chip->n_bytes; - dws->dma_width = chip->dma_width; dws->tx = (void *)transfer->tx_buf; dws->tx_end = dws->tx + transfer->len; @@ -324,6 +319,8 @@ static int dw_spi_transfer_one(struct spi_master *master, } else if (transfer->bits_per_word == 16) { dws->n_bytes = 2; dws->dma_width = 2; + } else { + return -EINVAL; } /* Default SPI mode is SCPOL = 0, SCPH = 0 */ cr0 = (transfer->bits_per_word - 1) @@ -437,15 +434,6 @@ static int dw_spi_setup(struct spi_device *spi) chip->tx_threshold = 0; } - if (spi->bits_per_word == 8) { - chip->n_bytes = 1; - chip->dma_width = 1; - } else if (spi->bits_per_word == 16) { - chip->n_bytes = 2; - chip->dma_width = 2; - } - chip->bits_per_word = spi->bits_per_word; - chip->tmode = 0; /* Tx & Rx */ if (gpio_is_valid(spi->cs_gpio)) { |