spi: mpc8xxx: Use get_timer

The comment before the transmission loop in conjunction with the
definition of SPI_TIMEOUT as 1000 implies that the loop is supposed to
have a timeout value of 1000 ms. But since there is no mdelay(1) or
similar in the loop body, the loop just runs 1000 times, without regard
for the time elapsed.

To correct this, use the standard get_timer functionality to properly
time out the loop after 1000 ms.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Acked-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index e09e91c8e997f6ddca339a49c93cf0c79fa68ac5..63e1a150f873305c3f1377f98e45352e25ba517f 100644 (file)
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -112,9 +112,9 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din,
 
        /* Handle data in 32-bit chunks */
        while (num_blks--) {
-               int tm;
                u32 tmpdout = 0;
                uchar xfer_bitlen = (bitlen >= 32 ? 32 : bitlen);
+               ulong start;
 
                clrbits_be32(&spi->mode, SPI_MODE_EN);
 
@@ -148,7 +148,8 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din,
                 * or time out (1 second = 1000 ms)
                 * The NE event must be read and cleared first
                 */
-               for (tm = 0; tm < SPI_TIMEOUT; ++tm) {
+               start = get_timer(0);
+               do {
                        u32 event = in_be32(&spi->event);
                        bool have_ne = event & SPI_EV_NE;
                        bool have_nf = event & SPI_EV_NF;
@@ -173,9 +174,11 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din,
                         */
                        if (have_nf)
                                break;
-               }
 
-               if (tm >= SPI_TIMEOUT)
+                       mdelay(1);
+               } while (get_timer(start) < SPI_TIMEOUT);
+
+               if (get_timer(start) >= SPI_TIMEOUT)
                        debug("*** %s: Time out during SPI transfer\n",
                              __func__);