Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 06:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

mmc: omap_hsmmc: consolidate flush posted writes for HSMMC IRQs

Browse Source 
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>
This commit is contained in:
Venkatraman S 2012-08-08 15:44:29 +05:30 committed by Chris Ball
parent 6c31b2150f
commit 1f6b9fa40e
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mmc/host/omap_hsmmc.c
View File

@ -969,15 +969,6 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
struct mmc_data *data; struct mmc_data *data;
int end_cmd = 0, end_trans = 0; 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; data = host->data;
dev_vdbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status); 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)) if (end_cmd || ((status & CC) && host->cmd))
omap_hsmmc_cmd_done(host, host->cmd); omap_hsmmc_cmd_done(host, host->cmd);
if ((end_trans || (status & TC)) && host->mrq) if ((end_trans || (status & TC)) && host->mrq)
@ -1045,11 +1034,13 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id)
int status; int status;
status = OMAP_HSMMC_READ(host->base, STAT); status = OMAP_HSMMC_READ(host->base, STAT);
do { while (status & INT_EN_MASK && host->req_in_progress) {
omap_hsmmc_do_irq(host, status); omap_hsmmc_do_irq(host, status);
/* Flush posted write */ /* Flush posted write */
OMAP_HSMMC_WRITE(host->base, STAT, status);
status = OMAP_HSMMC_READ(host->base, STAT); status = OMAP_HSMMC_READ(host->base, STAT);
} while (status & INT_EN_MASK); }
return IRQ_HANDLED; return IRQ_HANDLED;
} }