summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-fsl-espi.c
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2016-09-07 22:54:51 +0200
committerMark Brown <broonie@kernel.org>2016-09-12 20:03:50 +0100
commit38d003f1a43f3afd6b5e0da728f06dad07a85687 (patch)
tree291f105ce955416b70a7fbe312746aa973c85319 /drivers/spi/spi-fsl-espi.c
parent06af115d6c6d8b3d7b6cbc8a46f0603e70b1be58 (diff)
downloadlinux-38d003f1a43f3afd6b5e0da728f06dad07a85687.tar.gz
linux-38d003f1a43f3afd6b5e0da728f06dad07a85687.tar.bz2
linux-38d003f1a43f3afd6b5e0da728f06dad07a85687.zip
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>
Diffstat (limited to 'drivers/spi/spi-fsl-espi.c')
-rw-r--r--drivers/spi/spi-fsl-espi.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 7b2f997b061f..bef06762a770 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -276,11 +276,13 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
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;
- int ret = 0;
+ int ret;
+ fsl_espi_copy_to_buf(m, mspi);
fsl_espi_setup_transfer(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);
- 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)
fsl_espi_copy_from_buf(m, mspi);