mmc: omap_hsmmc: consolidate flush posted writes for HSMMC IRQs

Flushing spurious IRQs from HSMMC IP is done twice in omap_hsmmc_irq
and omap_hsmmc_do_irq.  Consolidate them to one location.

Signed-off-by: Venkatraman S <svenkatr@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 4 insertions, 13 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 4bc55acc6f36..20453c82d0f2 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -969,15 +969,6 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
         struct mmc_data *data;
         int end_cmd = 0, end_trans = 0;
 
-        if (!host->req_in_progress) {
-                do {
-                        OMAP_HSMMC_WRITE(host->base, STAT, status);
-                        /* Flush posted write */
-                        status = OMAP_HSMMC_READ(host->base, STAT);
-                } while (status & INT_EN_MASK);
-                return;
-        }
-
         data = host->data;
         dev_vdbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status);
 
@@ -1028,8 +1019,6 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
                 }
         }
 
-        OMAP_HSMMC_WRITE(host->base, STAT, status);
-
         if (end_cmd || ((status & CC) && host->cmd))
                 omap_hsmmc_cmd_done(host, host->cmd);
         if ((end_trans || (status & TC)) && host->mrq)
@@ -1045,11 +1034,13 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id)
         int status;
 
         status = OMAP_HSMMC_READ(host->base, STAT);
-        do {
+        while (status & INT_EN_MASK && host->req_in_progress) {
                 omap_hsmmc_do_irq(host, status);
+
                 /* Flush posted write */
+                OMAP_HSMMC_WRITE(host->base, STAT, status);
                 status = OMAP_HSMMC_READ(host->base, STAT);
-        } while (status & INT_EN_MASK);
+        }
 
         return IRQ_HANDLED;
 }