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>
This commit is contained in:
Qipan Li 2014-09-02 17:01:04 +08:00 committed by Mark Brown
parent 7850cdfc80
commit 0021d97334

View file

@ -303,7 +303,7 @@ static void spi_sirfsoc_dma_fini_callback(void *data)
complete(dma_complete); 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 spi_transfer *t)
{ {
struct sirfsoc_spi *sspi; 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); sspi->base + SIRFSOC_SPI_TX_RX_EN);
if (wait_for_completion_timeout(&sspi->tx_done, timeout) == 0) { if (wait_for_completion_timeout(&sspi->tx_done, timeout) == 0) {
dev_err(&spi->dev, "cmd transfer timeout\n"); dev_err(&spi->dev, "cmd transfer timeout\n");
return 0; return;
} }
sspi->left_rx_word -= t->len;
return t->len;
} }
static void spi_sirfsoc_dma_transfer(struct spi_device *spi, static void spi_sirfsoc_dma_transfer(struct spi_device *spi,