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>

diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 7b2f997..bef0676 100644 (file)
--- 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);