Skip to contentSkip to conversation

msm: mmc: Add msm prefix to platform data structure

PATCH In review Sahitya Tummala 2 participants 2 messages Jul 29, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 2/5 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.

---
 arch/arm/mach-msm/board-trout-mmc.c    |    2 +-
 arch/arm/mach-msm/devices-msm7x00.c    |    3 ++-
 arch/arm/mach-msm/include/mach/board.h |    3 ++-
 arch/arm/mach-msm/include/mach/mmc.h   |    2 +-
 drivers/mmc/host/msm_sdcc.c            |    2 +-
 drivers/mmc/host/msm_sdcc.h            |    2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
arch/arm/mach-msm/board-trout-mmc.c +1 -1
index 0ba3e92..44be846 100644
@@ -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,
arch/arm/mach-msm/devices-msm7x00.c +2 -1
index fde9d8f..4e8c0bc 100644
@@ -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;
arch/arm/mach-msm/include/mach/board.h +2 -1
index a3efb0d..5a79bcf 100644
@@ -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
arch/arm/mach-msm/include/mach/mmc.h +1 -1
index 0ecf254..d54b6b0 100644
@@ -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 *);
drivers/mmc/host/msm_sdcc.c +1 -1
index 57e00cf..42d4778 100644
@@ -1060,7 +1060,7 @@ msmsdcc_init_dma(struct msmsdcc_host *host)
 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;
drivers/mmc/host/msm_sdcc.h +1 -1
index da0039c..9c3bfc8 100644
@@ -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;
Signature · 5 lines
1.7.1

--
Consultant for Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum.
#1 lore raw

looks good

Quoted 100 lines · Sahitya Tummala

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

---
 arch/arm/mach-msm/board-trout-mmc.c    |    2 +- arch/arm/mach-msm/devices-msm7x00.c    |    3 ++- arch/arm/mach-msm/include/mach/board.h |    3 ++- arch/arm/mach-msm/include/mach/mmc.h   |    2 +- drivers/mmc/host/msm_sdcc.c            |    2 +- drivers/mmc/host/msm_sdcc.h            |    2 +-

 6 files changed, 8 insertions(+), 6 deletions(-)
arch/arm/mach-msm/board-trout-mmc.c +0 -0
index 0ba3e92..44be846 100644
@@ -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

arch/arm/mach-msm/board-trout-mmc.c +1 -1
-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,

arch/arm/mach-msm/devices-msm7x00.c +2 -1
index fde9d8f..4e8c0bc 100644
@@ -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;
arch/arm/mach-msm/include/mach/board.h +2 -1
index a3efb0d..5a79bcf 100644
@@ -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
arch/arm/mach-msm/include/mach/mmc.h +1 -1
index 0ecf254..d54b6b0 100644
@@ -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 *);

drivers/mmc/host/msm_sdcc.c +0 -0
index 57e00cf..42d4778 100644
@@ -1060,7 +1060,7 @@ msmsdcc_init_dma(struct msmsdcc_host *host)

 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;

drivers/mmc/host/msm_sdcc.h +0 -0
index da0039c..9c3bfc8 100644
@@ -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;
--
1.7.1

--
Consultant for Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum.

Signature · 2 lines
San Mehat  |  Staff Software Engineer  |  Infrastructure  |  Google Inc.
415.366.6172 ([email protected])