summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-fsl-espi.c
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2016-09-07 22:54:35 +0200
committerMark Brown <broonie@kernel.org>2016-09-12 20:03:49 +0100
commit06af115d6c6d8b3d7b6cbc8a46f0603e70b1be58 (patch)
tree2c5e79528375e2ade833a374ab717bfcf887d0d2 /drivers/spi/spi-fsl-espi.c
parentcce7e3a2fe39a5b66162a3dc1463a1af598d0803 (diff)
downloadlinux-06af115d6c6d8b3d7b6cbc8a46f0603e70b1be58.tar.gz
linux-06af115d6c6d8b3d7b6cbc8a46f0603e70b1be58.tar.bz2
linux-06af115d6c6d8b3d7b6cbc8a46f0603e70b1be58.zip
spi: fsl-espi: improve message length handling
Move checking for a zero-length message up in the call chain and use m->frame_length instead of re-calculating the overall length of all transfers in the message. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-fsl-espi.c')
-rw-r--r--drivers/spi/spi-fsl-espi.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 2af7463aea8d..7b2f997b061f 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -283,8 +283,7 @@ static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans)
fsl_espi_setup_transfer(spi, trans);
- if (trans->len)
- ret = fsl_espi_bufs(spi, trans);
+ ret = fsl_espi_bufs(spi, trans);
if (trans->delay_usecs)
udelay(trans->delay_usecs);
@@ -313,7 +312,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
struct spi_message *m)
{
struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);
- unsigned int delay_usecs = 0, xfer_len = 0;
+ unsigned int delay_usecs = 0;
struct spi_transfer *t, trans = {};
int ret;
@@ -322,8 +321,6 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
goto out;
list_for_each_entry(t, &m->transfers, transfer_list) {
- if ((t->tx_buf) || (t->rx_buf))
- xfer_len += t->len;
if (t->delay_usecs > delay_usecs)
delay_usecs = t->delay_usecs;
}
@@ -331,14 +328,15 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
t = list_first_entry(&m->transfers, struct spi_transfer,
transfer_list);
- trans.len = xfer_len;
+ trans.len = m->frame_length;
trans.speed_hz = t->speed_hz;
trans.bits_per_word = t->bits_per_word;
trans.delay_usecs = delay_usecs;
trans.tx_buf = mspi->local_buf;
trans.rx_buf = mspi->local_buf;
- ret = fsl_espi_trans(m, &trans);
+ if (trans.len)
+ ret = fsl_espi_trans(m, &trans);
m->actual_length = ret ? 0 : trans.len;
out: