msm: mmc: Add msm prefix to platform data structure

Rename mmc_platform_data to msm_mmc_platform_data as it is used
only by MSM platform.

Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>

diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c
index 0ba3e92e749388637d25622b6279160bebe598d0..44be8464657b323b9a49921a6ad39ab02b27a0f2 100644 (file)
--- a/arch/arm/mach-msm/board-trout-mmc.c
+++ b/arch/arm/mach-msm/board-trout-mmc.c
@@ -160,7 +160,7 @@ static unsigned int trout_sdslot_status(struct device *dev)
                        | MMC_VDD_25_26 | MMC_VDD_26_27 | MMC_VDD_27_28 \
                        | MMC_VDD_28_29 | MMC_VDD_29_30
 
-static struct mmc_platform_data trout_sdslot_data = {
+static struct msm_mmc_platform_data trout_sdslot_data = {
        .ocr_mask       = TROUT_MMC_VDD,
        .status         = trout_sdslot_status,
        .translate_vdd  = trout_sdslot_switchvdd,

diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index fde9d8f69f10b2c58bfdac3d26c05a9929610b61..4e8c0bcdc92df35e45853d7ae08748f4d8895ede 100644 (file)
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -322,7 +322,8 @@ static struct platform_device *msm_sdcc_devices[] __initdata = {
        &msm_device_sdc4,
 };
 
-int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat,
+int __init msm_add_sdcc(unsigned int controller,
+                       struct msm_mmc_platform_data *plat,
                        unsigned int stat_irq, unsigned long stat_irq_flags)
 {
        struct platform_device  *pdev;

diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
index a3efb0dc6dd6b5727c4da99ed1caa5852b69ecee..5a79bcf5041367894d876ece1a86f20f5948bb97 100644 (file)
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -41,7 +41,8 @@ void __init msm_init_irq(void);
 void __init msm_init_gpio(void);
 void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks);
 void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *);
-int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat,
+int __init msm_add_sdcc(unsigned int controller,
+                       struct msm_mmc_platform_data *plat,
                        unsigned int stat_irq, unsigned long stat_irq_flags);
 
 #endif

diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h
index 0ecf25426284b1c534e4bbf9992eabee8c90d6aa..d54b6b086cff412bba5ad9e489d9c0dbee7c1a2c 100644 (file)
--- a/arch/arm/mach-msm/include/mach/mmc.h
+++ b/arch/arm/mach-msm/include/mach/mmc.h
@@ -15,7 +15,7 @@ struct embedded_sdio_data {
        int num_funcs;
 };
 
-struct mmc_platform_data {
+struct msm_mmc_platform_data {
        unsigned int ocr_mask;                  /* available voltages */
        u32 (*translate_vdd)(struct device *, unsigned int);
        unsigned int (*status)(struct device *);

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 24e09454e52238c87c6b00dfdaee00196f4ac6eb..f15af5001d2664e7870a941f01bd8409634bb42d 100644 (file)
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1076,7 +1076,7 @@ do_resume_work(struct work_struct *work)
 static int
 msmsdcc_probe(struct platform_device *pdev)
 {
-       struct mmc_platform_data *plat = pdev->dev.platform_data;
+       struct msm_mmc_platform_data *plat = pdev->dev.platform_data;
        struct msmsdcc_host *host;
        struct mmc_host *mmc;
        struct resource *cmd_irqres = NULL;

diff --git a/drivers/mmc/host/msm_sdcc.h b/drivers/mmc/host/msm_sdcc.h
index da0039c9285e846164378bb817ff77e68a99847a..9c3bfc81a0f559900fc2263c6696cdc5edee1959 100644 (file)
--- a/drivers/mmc/host/msm_sdcc.h
+++ b/drivers/mmc/host/msm_sdcc.h
@@ -225,7 +225,7 @@ struct msmsdcc_host {
 
        u32                     pwr;
        u32                     saved_irq0mask; /* MMCIMASK0 reg value */
-       struct mmc_platform_data *plat;
+       struct msm_mmc_platform_data *plat;
 
        struct timer_list       timer;
        unsigned int            oldstat;