spi: spi-mxs: Remove mxs_spi_enable and mxs_spi_disable

These functions consist of nothing but one single writel call and are
only called once.  And the names really aren't accurate or clear,
since they don't enable or disble SPI.  Rather they set the bit that
controls the state of CS at the end of transfer.  It easier to follow
the code to just set this bit with a writel() along with all the other
bits being set in the same function.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index e6172aedf8594329e0e4a7658622dad28fdcb343..991ee01731b2066044e88359dbe8a68a1331416c 100644 (file)
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -145,22 +145,6 @@ static void mxs_spi_set_cs(struct mxs_spi *spi, unsigned cs)
        writel(select, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
 }
 
-static inline void mxs_spi_enable(struct mxs_spi *spi)
-{
-       struct mxs_ssp *ssp = &spi->ssp;
-
-       writel(BM_SSP_CTRL0_IGNORE_CRC,
-               ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
-}
-
-static inline void mxs_spi_disable(struct mxs_spi *spi)
-{
-       struct mxs_ssp *ssp = &spi->ssp;
-
-       writel(BM_SSP_CTRL0_IGNORE_CRC,
-               ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
-}
-
 static int mxs_ssp_wait(struct mxs_spi *spi, int offset, int mask, bool set)
 {
        const unsigned long timeout = jiffies + msecs_to_jiffies(SSP_TIMEOUT);
@@ -335,13 +319,15 @@ static int mxs_spi_txrx_pio(struct mxs_spi *spi, int cs,
        struct mxs_ssp *ssp = &spi->ssp;
 
        if (*first)
-               mxs_spi_enable(spi);
+               writel(BM_SSP_CTRL0_IGNORE_CRC,
+                      ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
 
        mxs_spi_set_cs(spi, cs);
 
        while (len--) {
                if (*last && len == 0)
-                       mxs_spi_disable(spi);
+                       writel(BM_SSP_CTRL0_IGNORE_CRC,
+                              ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
 
                if (ssp->devid == IMX23_SSP) {
                        writel(BM_SSP_CTRL0_XFER_COUNT,