[MMC] MMCI: Remove hardcoded MCI_IRQMASK definition

diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 7bf99a6e2b9437a5071c3e031b90d89c034bd00b..ca3ce579fead12da456a1e48cb20e67fc4688a1b 100644 (file)
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -268,11 +268,9 @@ static irqreturn_t mmci_irq(int irq, void *dev_id, struct pt_regs *regs)
                struct mmc_data *data;
 
                status = readl(host->base + MMCISTATUS);
+               status &= readl(host->base + MMCIMASK0);
                writel(status, host->base + MMCICLEAR);
 
-               if (!(status & MCI_IRQMASK))
-                       break;
-
                DBG(host, "irq0 %08x\n", status);
 
                data = host->data;

diff --git a/drivers/mmc/mmci.h b/drivers/mmc/mmci.h
index 5d6b9de5f975ce922c1d3633248398962d4442c9..95477f7945a64b1728bf77b015b3e63547aacaa0 100644 (file)
--- a/drivers/mmc/mmci.h
+++ b/drivers/mmc/mmci.h
@@ -103,11 +103,6 @@
 #define MMCIFIFOCNT            0x048
 #define MMCIFIFO               0x080 /* to 0x0bc */
 
-#define MCI_IRQMASK    \
-       (MCI_CMDCRCFAIL|MCI_DATACRCFAIL|MCI_CMDTIMEOUT|MCI_DATATIMEOUT| \
-       MCI_TXUNDERRUN|MCI_RXOVERRUN|MCI_CMDRESPEND|MCI_CMDSENT|        \
-       MCI_DATAEND|MCI_DATABLOCKEND)
-
 #define MCI_IRQENABLE  \
        (MCI_CMDCRCFAILMASK|MCI_DATACRCFAILMASK|MCI_CMDTIMEOUTMASK|     \
        MCI_DATATIMEOUTMASK|MCI_TXUNDERRUNMASK|MCI_RXOVERRUNMASK|       \