From 9db351d2fca4036ef0e6ea9def1620fbb023971e Mon Sep 17 00:00:00 2001
From: Alexander Tarasikov <alexander.tarasikov@gmail.com>
Date: Sun, 21 Aug 2011 15:52:44 +0400
Subject: [PATCH] --- yaml --- r: 270250 b: refs/heads/master c:
 e91957e70d2aea529ff2055b8fbd575f2d7b8c3b h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-msm/include/mach/mmc.h | 9 +--------
 trunk/drivers/mmc/host/msm_sdcc.c          | 9 +++++++++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index cb298e705e98..f17b6f95433d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 435f3e385962e2b34855e9b34f8b95717c1016a2
+refs/heads/master: e91957e70d2aea529ff2055b8fbd575f2d7b8c3b
diff --git a/trunk/arch/arm/mach-msm/include/mach/mmc.h b/trunk/arch/arm/mach-msm/include/mach/mmc.h
index 5631b51cec46..ffcd9e3a6a7e 100644
--- a/trunk/arch/arm/mach-msm/include/mach/mmc.h
+++ b/trunk/arch/arm/mach-msm/include/mach/mmc.h
@@ -8,13 +8,6 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio_func.h>
 
-struct embedded_sdio_data {
-	struct sdio_cis cis;
-	struct sdio_cccr cccr;
-	struct sdio_embedded_func *funcs;
-	int num_funcs;
-};
-
 struct msm_mmc_gpio {
 	unsigned no;
 	const char *name;
@@ -29,9 +22,9 @@ struct msm_mmc_platform_data {
 	unsigned int ocr_mask;			/* available voltages */
 	u32 (*translate_vdd)(struct device *, unsigned int);
 	unsigned int (*status)(struct device *);
-	struct embedded_sdio_data *embedded_sdio;
 	int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
 	struct msm_mmc_gpio_data *gpio_data;
+	void (*init_card)(struct mmc_card *card);
 };
 
 #endif
diff --git a/trunk/drivers/mmc/host/msm_sdcc.c b/trunk/drivers/mmc/host/msm_sdcc.c
index d06539dff7cc..cfe0c893ef04 100644
--- a/trunk/drivers/mmc/host/msm_sdcc.c
+++ b/trunk/drivers/mmc/host/msm_sdcc.c
@@ -1052,10 +1052,19 @@ static void msmsdcc_enable_sdio_irq(struct mmc_host *mmc, int enable)
 	spin_unlock_irqrestore(&host->lock, flags);
 }
 
+static void msmsdcc_init_card(struct mmc_host *mmc, struct mmc_card *card)
+{
+	struct msmsdcc_host *host = mmc_priv(mmc);
+
+	if (host->plat->init_card)
+		host->plat->init_card(card);
+}
+
 static const struct mmc_host_ops msmsdcc_ops = {
 	.request	= msmsdcc_request,
 	.set_ios	= msmsdcc_set_ios,
 	.enable_sdio_irq = msmsdcc_enable_sdio_irq,
+	.init_card	= msmsdcc_init_card,
 };
 
 static void