leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: fsl-espi: centralize populating struct spi_transfer

Browse Source 
Better structure the code by population all elements of struct
spi_transfer in one place.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Heiner Kallweit
2016-09-07 22:54:00 +02:00
committed by Mark Brown
parent d3152cf1c8
commit 96361fafbb
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/spi/spi-fsl-espi.c
View File

@@ -272,17 +272,8 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans)
{ {
struct spi_device *spi = m->spi; struct spi_device *spi = m->spi;
struct spi_transfer *t, *first;
int ret = 0; int ret = 0;
first = list_first_entry(&m->transfers, struct spi_transfer,
transfer_list);
list_for_each_entry(t, &m->transfers, transfer_list) {
trans->speed_hz = t->speed_hz;
trans->bits_per_word = t->bits_per_word;
trans->delay_usecs = max(first->delay_usecs, t->delay_usecs);
}
fsl_espi_setup_transfer(spi, trans); fsl_espi_setup_transfer(spi, trans);
if (trans->len) if (trans->len)
@@ -305,8 +296,6 @@ static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans,
tx_only = fsl_espi_copy_to_buf(m, mspi); tx_only = 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); ret = fsl_espi_do_trans(m, trans);
/* If there is at least one RX byte then copy it to rx_buff */ /* If there is at least one RX byte then copy it to rx_buff */
@@ -319,8 +308,9 @@ static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans,
static int fsl_espi_do_one_msg(struct spi_master *master, static int fsl_espi_do_one_msg(struct spi_master *master,
struct spi_message *m) struct spi_message *m)
{ {
struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);
u8 *rx_buf = NULL; u8 *rx_buf = NULL;
unsigned int xfer_len = 0; unsigned int delay_usecs = 0, xfer_len = 0;
struct spi_transfer *t, trans = {}; struct spi_transfer *t, trans = {};
int ret; int ret;
@@ -333,9 +323,19 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
rx_buf = t->rx_buf; rx_buf = t->rx_buf;
if ((t->tx_buf) || (t->rx_buf)) if ((t->tx_buf) || (t->rx_buf))
xfer_len += t->len; xfer_len += t->len;
if (t->delay_usecs > delay_usecs)
delay_usecs = t->delay_usecs;
} }
t = list_first_entry(&m->transfers, struct spi_transfer,
transfer_list);
trans.len = xfer_len; trans.len = xfer_len;
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, rx_buf); ret = fsl_espi_trans(m, &trans, rx_buf);