From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out.google.com ([74.125.121.35]:63026 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758113Ab0G2RSh convert rfc822-to-8bit (ORCPT ); Thu, 29 Jul 2010 13:18:37 -0400 Received: from hpaq13.eem.corp.google.com (hpaq13.eem.corp.google.com [172.25.149.13]) by smtp-out.google.com with ESMTP id o6THIZ4Y003204 for ; Thu, 29 Jul 2010 10:18:35 -0700 Received: from ywt2 (ywt2.prod.google.com [10.192.20.2]) by hpaq13.eem.corp.google.com with ESMTP id o6THIX0t011837 for ; Thu, 29 Jul 2010 10:18:34 -0700 Received: by ywt2 with SMTP id 2so198699ywt.18 for ; Thu, 29 Jul 2010 10:18:33 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1280402734-9193-1-git-send-email-stummala@codeaurora.org> References: <1280402734-9193-1-git-send-email-stummala@codeaurora.org> Date: Thu, 29 Jul 2010 10:18:30 -0700 Message-ID: Subject: Re: [PATCH 2/5] msm: mmc: Add msm prefix to platform data structure From: San Mehat Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-arm-msm-owner@vger.kernel.org List-ID: To: Sahitya Tummala Cc: linux-arm-msm@vger.kernel.org looks good On Thu, Jul 29, 2010 at 4:25 AM, Sahitya Tummala wrote: > Rename mmc_platform_data to msm_mmc_platform_data as it is used > only by MSM platform. > > Signed-off-by: Sahitya Tummala > --- >  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(-) > > diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c > index 0ba3e92..44be846 100644 > --- 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 fde9d8f..4e8c0bc 100644 > --- 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 a3efb0d..5a79bcf 100644 > --- 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 0ecf254..d54b6b0 100644 > --- 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 57e00cf..42d4778 100644 > --- a/drivers/mmc/host/msm_sdcc.c > +++ b/drivers/mmc/host/msm_sdcc.c > @@ -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; > diff --git a/drivers/mmc/host/msm_sdcc.h b/drivers/mmc/host/msm_sdcc.h > index da0039c..9c3bfc8 100644 > --- 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; > -- > 1.7.1 > > -- > Consultant for Qualcomm Innovation Center, Inc. > Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum. > -- San Mehat  |  Staff Software Engineer  |  Infrastructure  |  Google Inc. 415.366.6172 (san@google.com)