spi: rspi: Absorb rspi_rz_transfer_out_in() into rspi_rz_transfer_one()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 2 Jun 2014 13:38:16 +0000 (15:38 +0200)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 14:49:35 +0000 (15:49 +0100)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-rspi.c

index c77cfe654b0e299ec1772f776722d4bb1522e117..b7f8be81423b615fa7e9984a32b88a58a0c14294 100644 (file)
@@ -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)
 {