renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

spi: fsl-espi: factor out handling of read data

Browse Source 
Factor out copying read data to the read buffers in the original
message to a new function fsl_espi_copy_from_buf.
This also allows to simplify fsl_espi_copy_to_buf.

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:18 +02:00 committed by Mark Brown
parent 96361fafbb
commit cce7e3a2fe
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,25 +77,32 @@ struct fsl_espi_reg {
#define AUTOSUSPEND_TIMEOUT 2000
static unsigned int fsl_espi_copy_to_buf(struct spi_message *m,
static void fsl_espi_copy_to_buf(struct spi_message *m,
struct mpc8xxx_spi *mspi)
{
unsigned int tx_only = 0;
struct spi_transfer *t;
u8 *buf = mspi->local_buf;
list_for_each_entry(t, &m->transfers, transfer_list) {
if (t->tx_buf) {
if (t->tx_buf)
memcpy(buf, t->tx_buf, t->len);
if (!t->rx_buf)
tx_only += t->len;
} else {
else
memset(buf, 0, t->len);
}
buf += t->len;
}
}
return tx_only;
static void fsl_espi_copy_from_buf(struct spi_message *m,
struct mpc8xxx_spi *mspi)
{
struct spi_transfer *t;
u8 *buf = mspi->local_buf;
list_for_each_entry(t, &m->transfers, transfer_list) {
if (t->rx_buf)
memcpy(t->rx_buf, buf, t->len);
buf += t->len;
}
}
static int fsl_espi_check_message(struct spi_message *m)
@ -287,20 +294,17 @@ static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans)
return ret;
}
static int fsl_espi_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)
{
struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);
unsigned int tx_only;
int ret;
tx_only = fsl_espi_copy_to_buf(m, mspi);
fsl_espi_copy_to_buf(m, mspi);
ret = fsl_espi_do_trans(m, trans);
/* 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);
if (!ret)
fsl_espi_copy_from_buf(m, mspi);
return ret;
}
@ -309,7 +313,6 @@ 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);
u8 *rx_buf = NULL;
unsigned int delay_usecs = 0, xfer_len = 0;
struct spi_transfer *t, trans = {};
int ret;
@ -319,8 +322,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->rx_buf)
rx_buf = t->rx_buf;
if ((t->tx_buf) || (t->rx_buf))
xfer_len += t->len;
if (t->delay_usecs > delay_usecs)
@ -337,7 +338,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
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);
m->actual_length = ret ? 0 : trans.len;
out: