mmc: meson-gx: remove open coded read with timeout

There is already a function available to poll a register until a
condition is met. Let's use it instead of open coding it.

Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 2eba507790e49bf2a2c5500a22cdb9ecfcbfe19d..2deeacc051b1c8441088c7e2c0c256db192b2c80 100644 (file)
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/iopoll.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
@@ -1100,7 +1101,6 @@ out:
 
 static int meson_mmc_wait_desc_stop(struct meson_host *host)
 {
-       int loop;
        u32 status;
 
        /*
@@ -1110,20 +1110,10 @@ static int meson_mmc_wait_desc_stop(struct meson_host *host)
         * If we don't confirm the descriptor is stopped, it might raise new
         * IRQs after we have called mmc_request_done() which is bad.
         */
-       for (loop = 50; loop; loop--) {
-               status = readl(host->regs + SD_EMMC_STATUS);
-               if (status & (STATUS_BUSY | STATUS_DESC_BUSY))
-                       udelay(100);
-               else
-                       break;
-       }
 
-       if (status & (STATUS_BUSY | STATUS_DESC_BUSY)) {
-               dev_err(host->dev, "Timed out waiting for host to stop\n");
-               return -ETIMEDOUT;
-       }
-
-       return 0;
+       return readl_poll_timeout(host->regs + SD_EMMC_STATUS, status,
+                                 !(status & (STATUS_BUSY | STATUS_DESC_BUSY)),
+                                 100, 5000);
 }
 
 static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)