Skip to content

Commit

Permalink
msm: mmc: Add msm prefix to platform data structure
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sahitya Tummala authored and Daniel Walker committed Aug 9, 2010
1 parent 28d6c3d commit b5d643d
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-msm/board-trout-mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-msm/devices-msm7x00.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-msm/include/mach/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion arch/arm/mach-msm/include/mach/mmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/msm_sdcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/msm_sdcc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b5d643d

Please sign in to comment.