]> Pileus Git - ~andy/linux/commitdiff
mmc: dw_mmc: Don't loop when handling an interrupt
authorMarkos Chandras <markos.chandras@imgtec.com>
Tue, 12 Mar 2013 10:53:11 +0000 (10:53 +0000)
committerChris Ball <cjb@laptop.org>
Fri, 22 Mar 2013 16:45:32 +0000 (12:45 -0400)
There is no reason to loop when handling an interrupt. The "if" clauses
will handle all of them sequentially. This also eliminates the extra loop
we used to take with no pending interrupts and we ended up breaking out
of the while loop.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/dw_mmc.c

index 7716a08675fc8f8127dd5f47f9f698569bcfae1c..e7be4023382cbb2c39b05567df73ef1f8ae29cca 100644 (file)
@@ -1573,11 +1573,11 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 {
        struct dw_mci *host = dev_id;
        u32 pending;
-       unsigned int pass_count = 0;
        int i;
 
-       do {
-               pending = mci_readl(host, MINTSTS); /* read-only mask reg */
+       pending = mci_readl(host, MINTSTS); /* read-only mask reg */
+
+       if (pending) {
 
                /*
                 * DTO fix - version 2.10a and below, and only if internal DMA
@@ -1589,9 +1589,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
                                pending |= SDMMC_INT_DATA_OVER;
                }
 
-               if (!pending)
-                       break;
-
                if (pending & DW_MCI_CMD_ERROR_FLAGS) {
                        mci_writel(host, RINTSTS, DW_MCI_CMD_ERROR_FLAGS);
                        host->cmd_status = pending;
@@ -1652,7 +1649,7 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
                        }
                }
 
-       } while (pass_count++ < 5);
+       }
 
 #ifdef CONFIG_MMC_DW_IDMAC
        /* Handle DMA interrupts */