From 4bb82238e57289683642a7450aa75cf3ee00974c Mon Sep 17 00:00:00 2001
From: "Juha Yrjola juha.yrjola" <at solidboot.com>
Date: Sat, 11 Nov 2006 23:42:39 +0100
Subject: [PATCH] --- yaml --- r: 41439 b: refs/heads/master c:
 c5cb431d27237937e1b04a888bf2f8863f06fa2d h: refs/heads/master i:   41437:
 0e3f93926c40f6740914c08b79b5422a5e7e0a18   41435:
 2c56ca49867086434810116185c16a9a62ecd9a0   41431:
 db4bf8a6e44e743634a47ae6e5164418a0f416fc   41423:
 e129a224582e7aab502c078e3897067c7a6b8526   41407:
 6b9b73b9a3c2531b32f6aa56ae3cbe330812694b v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/mmc/omap.c | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 9ebaef2da9ac..f44a45693f50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4204fdf05e70cdbff1f657e3ed78eddd3d6267f
+refs/heads/master: c5cb431d27237937e1b04a888bf2f8863f06fa2d
diff --git a/trunk/drivers/mmc/omap.c b/trunk/drivers/mmc/omap.c
index 4e46750e8d0a..f8830c527603 100644
--- a/trunk/drivers/mmc/omap.c
+++ b/trunk/drivers/mmc/omap.c
@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsigned long arg)
 	schedule_work(&host->switch_work);
 }
 
-/* FIXME: Handle card insertion and removal properly. Maybe use a mask
- * for MMC state? */
-static void mmc_omap_switch_callback(unsigned long data, u8 mmc_mask)
-{
-}
-
 static void mmc_omap_switch_handler(void *data)
 {
 	struct mmc_omap_host *host = (struct mmc_omap_host *) data;
@@ -824,7 +818,6 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
 		return;
 	}
 
-
 	block_size = data->blksz;
 
 	OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
@@ -896,7 +889,6 @@ static void mmc_omap_request(struct mmc_host *mmc, struct mmc_request *req)
 static void innovator_fpga_socket_power(int on)
 {
 #if defined(CONFIG_MACH_OMAP_INNOVATOR) && defined(CONFIG_ARCH_OMAP15XX)
-
 	if (on) {
 		fpga_write(fpga_read(OMAP1510_FPGA_POWER) | (1 << 3),
 		     OMAP1510_FPGA_POWER);
@@ -978,7 +970,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	case MMC_POWER_UP:
 	case MMC_POWER_ON:
 		mmc_omap_power(host, 1);
-		dsor |= 1<<11;
+		dsor |= 1 << 11;
 		break;
 	}
 
@@ -997,8 +989,8 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 		/* Send clock cycles, poll completion */
 		OMAP_MMC_WRITE(host, IE, 0);
 		OMAP_MMC_WRITE(host, STAT, 0xffff);
-		OMAP_MMC_WRITE(host, CMD, 1<<7);
-		while (0 == (OMAP_MMC_READ(host, STAT) & 1));
+		OMAP_MMC_WRITE(host, CMD, 1 << 7);
+		while ((OMAP_MMC_READ(host, STAT) & 1) == 0);
 		OMAP_MMC_WRITE(host, STAT, 1);
 	}
 	clk_disable(host->fclk);
@@ -1093,7 +1085,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
 	mmc->ops = &mmc_omap_ops;
 	mmc->f_min = 400000;
 	mmc->f_max = 24000000;
-	mmc->ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34;
+	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
 	mmc->caps = MMC_CAP_MULTIWRITE | MMC_CAP_BYTEBLOCK;
 
 	if (minfo->wire4)