aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd/glamo/glamo-mci.c
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-19 17:11:12 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:11:12 +0000
commit76c610b9257eda81b5eda46ea3e7c00a6db1b7d6 (patch)
treebcd8a465296d90b88f188cea2c6ca6cde01b7480 /drivers/mfd/glamo/glamo-mci.c
parentc520396b96bc826ff0f2df8aeead5b76df316e0c (diff)
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 <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd/glamo/glamo-mci.c')
-rw-r--r--drivers/mfd/glamo/glamo-mci.c8
1 files changed, 4 insertions, 4 deletions
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;