From: Markos Chandras Date: Tue, 12 Mar 2013 10:53:11 +0000 (+0000) Subject: mmc: dw_mmc: Don't loop when handling an interrupt X-Git-Tag: v3.10-rc1~96^2~41 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=1fb5f68addde6d8b79dd7d747814aa1770e6cf21;p=~andy%2Flinux mmc: dw_mmc: Don't loop when handling an interrupt 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 Acked-by: Jaehoon Chung Acked-by: Seungwon Jeon Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 7716a08675f..e7be4023382 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -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 */