summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2016-09-07 22:52:25 +0200
committerMark Brown <broonie@kernel.org>2016-09-12 19:58:45 +0100
commit809b1e017bbdaf40d35619e41c1dbc542a5449d2 (patch)
treeb9d05f499ee2378f202a502994449674fdd6b6af /drivers/spi
parentfaceef390702bad8bdf9c93554a3364253d9d943 (diff)
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>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-fsl-espi.c33
1 files changed, 6 insertions, 27 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 8554f18e4cf6..f8a6dd13ee02 100644
--- 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;