aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2015-06-23 09:04:28 -0400
committerMark Brown <broonie@kernel.org>2015-07-03 08:52:10 -0400
commit5d4db691ed978080435f4e5aad2ce707294a75b4 (patch)
tree12fff4a473d4428dad9eb8603ac0dd45dd5aa789
parentfda052b0a52261ecad8c8beb6bcfa1663a35975f (diff)
spi: rspi: Drop variable "error" in qspi_trigger_transfer_out_in()
Just use "ret" instead, for consistency with other similar functions. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-rspi.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index f9189a0c8cec..9a71fa2e53a9 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -725,24 +725,23 @@ static int qspi_trigger_transfer_out_in(struct rspi_data *rspi, const u8 *tx,
725 u8 *rx, unsigned int len) 725 u8 *rx, unsigned int len)
726{ 726{
727 int i, n, ret; 727 int i, n, ret;
728 int error;
729 728
730 while (len > 0) { 729 while (len > 0) {
731 n = qspi_set_send_trigger(rspi, len); 730 n = qspi_set_send_trigger(rspi, len);
732 qspi_set_receive_trigger(rspi, len); 731 qspi_set_receive_trigger(rspi, len);
733 if (n == QSPI_BUFFER_SIZE) { 732 if (n == QSPI_BUFFER_SIZE) {
734 error = rspi_wait_for_tx_empty(rspi); 733 ret = rspi_wait_for_tx_empty(rspi);
735 if (error < 0) { 734 if (ret < 0) {
736 dev_err(&rspi->master->dev, "transmit timeout\n"); 735 dev_err(&rspi->master->dev, "transmit timeout\n");
737 return error; 736 return ret;
738 } 737 }
739 for (i = 0; i < n; i++) 738 for (i = 0; i < n; i++)
740 rspi_write_data(rspi, *tx++); 739 rspi_write_data(rspi, *tx++);
741 740
742 error = rspi_wait_for_rx_full(rspi); 741 ret = rspi_wait_for_rx_full(rspi);
743 if (error < 0) { 742 if (ret < 0) {
744 dev_err(&rspi->master->dev, "receive timeout\n"); 743 dev_err(&rspi->master->dev, "receive timeout\n");
745 return error; 744 return ret;
746 } 745 }
747 for (i = 0; i < n; i++) 746 for (i = 0; i < n; i++)
748 *rx++ = rspi_read_data(rspi); 747 *rx++ = rspi_read_data(rspi);