openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: fsl-espi: remove element actual_length from struct fsl_espi_trans 

If an error occurs during processing the message, then we don't have
to populate the actual_length element of struct message.
So we can get rid of element actual_length in struct
fsl_espi_transfer.

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:51:48 +02:00 committed by Mark Brown
parent 0319d4991e
commit 5cd7b8be6b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,6 @@ struct fsl_espi_transfer {
const void *tx_buf; const void *tx_buf;
void *rx_buf; void *rx_buf;
unsigned len; unsigned len;
unsigned actual_length;
}; };
/* eSPI Controller mode register definitions */ /* eSPI Controller mode register definitions */
@ -327,8 +326,6 @@ static int fsl_espi_cmd_trans(struct spi_message *m,
espi_trans->rx_buf = mspi->local_buf; espi_trans->rx_buf = mspi->local_buf;
ret = fsl_espi_do_trans(m, espi_trans); ret = fsl_espi_do_trans(m, espi_trans);
espi_trans->actual_length = espi_trans->len;
return ret; return ret;
} }
@ -350,7 +347,6 @@ static int fsl_espi_rw_trans(struct spi_message *m,
if (trans->len > tx_only) if (trans->len > tx_only)
memcpy(rx_buff, trans->rx_buf + tx_only, memcpy(rx_buff, trans->rx_buf + tx_only,
trans->len - tx_only); trans->len - tx_only);
trans->actual_length += trans->len;
} }
return ret; return ret;
@ -373,14 +369,14 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
} }
espi_trans.len = xfer_len; espi_trans.len = xfer_len;
espi_trans.actual_length = 0;
if (!rx_buf) if (!rx_buf)
ret = fsl_espi_cmd_trans(m, &espi_trans, NULL); ret = fsl_espi_cmd_trans(m, &espi_trans, NULL);
else else
ret = fsl_espi_rw_trans(m, &espi_trans, rx_buf); ret = fsl_espi_rw_trans(m, &espi_trans, rx_buf);
m->actual_length = espi_trans.actual_length; m->actual_length = ret ? 0 : espi_trans.len;
if (m->status == -EINPROGRESS) if (m->status == -EINPROGRESS)
m->status = ret; m->status = ret;