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

spi: fsl-espi: merge fsl_espi_trans and fsl_espi_do_trans 

Merge both functions to reduce source code size and improve
readability.

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:51 +02:00 committed by Mark Brown
parent 06af115d6c
commit 38d003f1a4
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,11 +276,13 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
return mpc8xxx_spi->count > 0 ? -EMSGSIZE : 0; return mpc8xxx_spi->count > 0 ? -EMSGSIZE : 0;
} }
static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans)
{ {
struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);
struct spi_device *spi = m->spi; struct spi_device *spi = m->spi;
int ret = 0; int ret;
fsl_espi_copy_to_buf(m, mspi);
fsl_espi_setup_transfer(spi, trans); fsl_espi_setup_transfer(spi, trans);
ret = fsl_espi_bufs(spi, trans); ret = fsl_espi_bufs(spi, trans);
@ -290,18 +292,6 @@ static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans)
fsl_espi_setup_transfer(spi, NULL); fsl_espi_setup_transfer(spi, NULL);
return ret;
}
static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans)
{
struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master);
int ret;
fsl_espi_copy_to_buf(m, mspi);
ret = fsl_espi_do_trans(m, trans);
if (!ret) if (!ret)
fsl_espi_copy_from_buf(m, mspi); fsl_espi_copy_from_buf(m, mspi);