From 76c610b9257eda81b5eda46ea3e7c00a6db1b7d6 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 19 Nov 2008 17:11:12 +0000 Subject: fix-rebase-dust.patch Last rebase to stable-2.6.26 left some trash from rebasing the patches on top of this, clean it back out Signed-off-by: Andy Green --- drivers/mfd/glamo/glamo-core.c | 2 +- drivers/mfd/glamo/glamo-mci.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/mfd/glamo') diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 533f8f38427..d605e2d7cb8 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -1212,7 +1212,7 @@ static int __init glamo_probe(struct platform_device *pdev) if (glamo->pdata->glamo_irq_is_wired && !glamo->pdata->glamo_irq_is_wired()) { set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler); - set_irq_type(glamo->irq, IRQT_FALLING); + set_irq_type(glamo->irq, IRQ_TYPE_EDGE_FALLING); dev_info(&pdev->dev, "Glamo interrupt registered\n"); glamo->irq_works = 1; } else { diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index b5d6ad10dd9..1a8e70251d5 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -285,11 +285,11 @@ static void __glamo_mci_fix_card_div(struct glamo_mci_host *host, int div) * register shared with SCLK divisor -- no chance of race because * we don't use sensor interface */ - writew_dly((readw(glamo_mci_def_pdata.pglamo->base + + writew((readw(glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8) & 0xff00) | div, glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8); /* enable clock to divider input */ - writew_dly(readw(glamo_mci_def_pdata.pglamo->base + + writew(readw(glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK, glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1); @@ -628,12 +628,12 @@ static void glamo_mci_send_request(struct mmc_host *mmc) */ do status = readw(host->base + GLAMO_REG_MMC_RB_STAT1); - while ((((status >> 15) & 1) != (host->ccnt & 1)) || + while (((((status >> 15) & 1) != (host->ccnt & 1)) || (!(status & (GLAMO_STAT1_MMC_RB_RRDY | GLAMO_STAT1_MMC_RTOUT | GLAMO_STAT1_MMC_DTOUT | GLAMO_STAT1_MMC_BWERR | - GLAMO_STAT1_MMC_BRERR))) && (insanity_timeout--)); + GLAMO_STAT1_MMC_BRERR)))) && (insanity_timeout--)); if (insanity_timeout < 0) { cmd->error = -ETIMEDOUT; -- cgit v1.2.3