[PATCH 3/8] sdhci: Clear interrupt status register just once
in [Kernel]
|
Prev: [PATCH 7/8] sdhci: Get rid of mdelay()s where it is safe and makes sense
Next: [PATCH 8/8] sdhci: Use jiffies instead of a timeout counter
From: Anton Vorontsov on 14 Jul 2010 09:10 There's no need to clear the interrupt status register bit-by-bit, we can just clear it once. This simplifies irq handler. Signed-off-by: Anton Vorontsov <avorontsov(a)mvista.com> --- drivers/mmc/host/sdhci.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 748a2e3..9ec245c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1522,38 +1522,29 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) goto out; } + sdhci_writel(host, intmask, SDHCI_INT_STATUS); + DBG("*** %s got interrupt: 0x%08x\n", mmc_hostname(host->mmc), intmask); - if (intmask & (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE)) { - sdhci_writel(host, intmask & (SDHCI_INT_CARD_INSERT | - SDHCI_INT_CARD_REMOVE), SDHCI_INT_STATUS); + if (intmask & (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE)) schedule_work(&host->card_detect_work); - } intmask &= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE); - if (intmask & SDHCI_INT_CMD_MASK) { - sdhci_writel(host, intmask & SDHCI_INT_CMD_MASK, - SDHCI_INT_STATUS); + if (intmask & SDHCI_INT_CMD_MASK) sdhci_cmd_irq(host, intmask & SDHCI_INT_CMD_MASK); - } - if (intmask & SDHCI_INT_DATA_MASK) { - sdhci_writel(host, intmask & SDHCI_INT_DATA_MASK, - SDHCI_INT_STATUS); + if (intmask & SDHCI_INT_DATA_MASK) sdhci_data_irq(host, intmask & SDHCI_INT_DATA_MASK); - } intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK); intmask &= ~SDHCI_INT_ERROR; - if (intmask & SDHCI_INT_BUS_POWER) { + if (intmask & SDHCI_INT_BUS_POWER) printk(KERN_ERR "%s: Card is consuming too much power!\n", mmc_hostname(host->mmc)); - sdhci_writel(host, SDHCI_INT_BUS_POWER, SDHCI_INT_STATUS); - } intmask &= ~SDHCI_INT_BUS_POWER; @@ -1566,8 +1557,6 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) printk(KERN_ERR "%s: Unexpected interrupt 0x%08x.\n", mmc_hostname(host->mmc), intmask); sdhci_dumpregs(host); - - sdhci_writel(host, intmask, SDHCI_INT_STATUS); } result = IRQ_HANDLED; -- 1.7.0.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |