summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-rspi.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-06-02 15:38:16 +0200
committerMark Brown <broonie@linaro.org>2014-06-02 15:49:35 +0100
commit03e627c55752fa434d5b3eba5ee3e489c51672b6 (patch)
treed020694d9eca0a09a1b175ad05a1ac9cb6a3f18a /drivers/spi/spi-rspi.c
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/spi-rspi.c')
-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,
return 0;
}
-static int rspi_rz_transfer_out_in(struct rspi_data *rspi,
- struct spi_transfer *xfer)
+static int rspi_rz_transfer_one(struct spi_master *master,
+ struct spi_device *spi,
+ struct spi_transfer *xfer)
{
+ struct rspi_data *rspi = spi_master_get_devdata(master);
int ret;
rspi_rz_receive_init(rspi);
@@ -633,15 +635,6 @@ static int rspi_rz_transfer_out_in(struct rspi_data *rspi,
return 0;
}
-static int rspi_rz_transfer_one(struct spi_master *master,
- struct spi_device *spi,
- struct spi_transfer *xfer)
-{
- struct rspi_data *rspi = spi_master_get_devdata(master);
-
- return rspi_rz_transfer_out_in(rspi, xfer);
-}
-
static int qspi_transfer_out_in(struct rspi_data *rspi,
struct spi_transfer *xfer)
{