From ce23172d605d34e18e8087adce705909e343a8cd Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 2 Jun 2014 15:38:16 +0200 Subject: [PATCH] spi: rspi: Absorb rspi_rz_transfer_out_in() into rspi_rz_transfer_one() Signed-off-by: Geert Uytterhoeven Signed-off-by: Mark Brown (cherry picked from commit 03e627c55752fa434d5b3eba5ee3e489c51672b6) Signed-off-by: Simon Horman --- drivers/spi/spi-rspi.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index c77cfe6..b7f8be8 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) { -- 2.7.4