diff options
| author | Qipan Li <Qipan.Li@csr.com> | 2014-09-02 11:01:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-05 00:35:58 +0200 |
| commit | 0021d97334d207169d2935489b8be11dc52c54a8 (patch) | |
| tree | c636d2a82db70e6ae8fcef9c8bfd4e3f71663cfe /drivers/spi | |
| parent | spi: sirf: correct spi gpio and hardware chipselect behaviour (diff) | |
| download | linux-0021d97334d207169d2935489b8be11dc52c54a8.tar.xz linux-0021d97334d207169d2935489b8be11dc52c54a8.zip | |
spi: sirf: fix 'cmd_transfer' function typos
unify 'cmd_transfer' like 'pio_transfer' and 'dma_transfer' as void
function, and also change left_rx_word according to transfer result.
Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sirf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index 44ec3bbbf5a4..d6308e6a9b47 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c @@ -303,7 +303,7 @@ static void spi_sirfsoc_dma_fini_callback(void *data) complete(dma_complete); } -static int spi_sirfsoc_cmd_transfer(struct spi_device *spi, +static void spi_sirfsoc_cmd_transfer(struct spi_device *spi, struct spi_transfer *t) { struct sirfsoc_spi *sspi; @@ -325,10 +325,9 @@ static int spi_sirfsoc_cmd_transfer(struct spi_device *spi, sspi->base + SIRFSOC_SPI_TX_RX_EN); if (wait_for_completion_timeout(&sspi->tx_done, timeout) == 0) { dev_err(&spi->dev, "cmd transfer timeout\n"); - return 0; + return; } - - return t->len; + sspi->left_rx_word -= t->len; } static void spi_sirfsoc_dma_transfer(struct spi_device *spi, |