aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-06-02 09:38:16 -0400
committerMark Brown <broonie@linaro.org>2014-06-02 10:49:35 -0400
commit03e627c55752fa434d5b3eba5ee3e489c51672b6 (patch)
treed020694d9eca0a09a1b175ad05a1ac9cb6a3f18a /drivers/spi
parentc52fb6d63425248bd4152451a2cc74b7df8fa989 (diff)
spi: rspi: Absorb rspi_rz_transfer_out_in() into rspi_rz_transfer_one()
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-rspi.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index c77cfe654b0e..b7f8be81423b 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -616,9 +616,11 @@ static int rspi_transfer_one(struct spi_master *master, struct spi_device *spi,
616 return 0; 616 return 0;
617} 617}
618 618
619static int rspi_rz_transfer_out_in(struct rspi_data *rspi, 619static int rspi_rz_transfer_one(struct spi_master *master,
620 struct spi_transfer *xfer) 620 struct spi_device *spi,
621 struct spi_transfer *xfer)
621{ 622{
623 struct rspi_data *rspi = spi_master_get_devdata(master);
622 int ret; 624 int ret;
623 625
624 rspi_rz_receive_init(rspi); 626 rspi_rz_receive_init(rspi);
@@ -633,15 +635,6 @@ static int rspi_rz_transfer_out_in(struct rspi_data *rspi,
633 return 0; 635 return 0;
634} 636}
635 637
636static int rspi_rz_transfer_one(struct spi_master *master,
637 struct spi_device *spi,
638 struct spi_transfer *xfer)
639{
640 struct rspi_data *rspi = spi_master_get_devdata(master);
641
642 return rspi_rz_transfer_out_in(rspi, xfer);
643}
644
645static int qspi_transfer_out_in(struct rspi_data *rspi, 638static int qspi_transfer_out_in(struct rspi_data *rspi,
646 struct spi_transfer *xfer) 639 struct spi_transfer *xfer)
647{ 640{