spi: fsl-espi: merge fsl_espi_cmd_trans and fsl_espi_rw_trans

fsl_espi_cmd_trans and fsl_espi_rw_trans share most of the code so
we can merge them.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 8554f18e4cf6d911e1cf9f0a996d1b30fc5448ab..f8a6dd13ee02a0a29f86c838e414210e1caf60b8 100644 (file)
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -299,23 +299,8 @@ static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans)
        return ret;
 }
 
-static int fsl_espi_cmd_trans(struct spi_message *m,
-                             struct spi_transfer *trans, u8 *rx_buff)
-{
-       struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);
-       int ret;
-
-       fsl_espi_copy_to_buf(m, mspi);
-
-       trans->tx_buf = mspi->local_buf;
-       trans->rx_buf = mspi->local_buf;
-       ret = fsl_espi_do_trans(m, trans);
-
-       return ret;
-}
-
-static int fsl_espi_rw_trans(struct spi_message *m,
-                            struct spi_transfer *trans, u8 *rx_buff)
+static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans,
+                         u8 *rx_buff)
 {
        struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);
        unsigned int tx_only;
@@ -327,12 +312,9 @@ static int fsl_espi_rw_trans(struct spi_message *m,
        trans->rx_buf = mspi->local_buf;
        ret = fsl_espi_do_trans(m, trans);
 
-       if (!ret) {
-               /* If there is at least one RX byte then copy it to rx_buff */
-               if (trans->len > tx_only)
-                       memcpy(rx_buff, trans->rx_buf + tx_only,
-                              trans->len - tx_only);
-       }
+       /* If there is at least one RX byte then copy it to rx_buff */
+       if (!ret && rx_buff && trans->len > tx_only)
+               memcpy(rx_buff, trans->rx_buf + tx_only, trans->len - tx_only);
 
        return ret;
 }
@@ -354,10 +336,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
 
        trans.len = xfer_len;
 
-       if (!rx_buf)
-               ret = fsl_espi_cmd_trans(m, &trans, NULL);
-       else
-               ret = fsl_espi_rw_trans(m, &trans, rx_buf);
+       ret = fsl_espi_trans(m, &trans, rx_buf);
 
        m->actual_length = ret ? 0 : trans.len;