From: Shawn Guo <shawn.guo@linaro.org>
To: Fabio Estevam <festevam@gmail.com>
Cc: cjb@laptop.org, marex@denx.de, linux-mmc@vger.kernel.org,
Fabio Estevam <fabio.estevam@freescale.com>
Subject: Re: [PATCH] mmc: mxs-mmc: Remove platform data
Date: Wed, 31 Oct 2012 14:43:09 +0800 [thread overview]
Message-ID: <20121031064307.GD8100@S2100-06.ap.freescale.net> (raw)
In-Reply-To: <1351654547-615-1-git-send-email-festevam@gmail.com>
On Wed, Oct 31, 2012 at 01:35:47AM -0200, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> All MXS users have been converted to device tree and the board files have been
> removed.
>
> No need to keep platform data in the driver.
>
> Also move bus_width declaration in the beggining of mxs_mmc_probe() to avoid:
> 'warning: ISO C90 forbids mixed declarations and code'.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> drivers/mmc/host/mxs-mmc.c | 30 ++++++++++--------------------
> 1 file changed, 10 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 80d1e6d..37fd9fc 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -593,13 +593,13 @@ static int mxs_mmc_probe(struct platform_device *pdev)
> struct mxs_mmc_host *host;
> struct mmc_host *mmc;
> struct resource *iores, *dmares;
> - struct mxs_mmc_platform_data *pdata;
Remove the struct definition altogether?
Shawn
> struct pinctrl *pinctrl;
> int ret = 0, irq_err, irq_dma;
> dma_cap_mask_t mask;
> struct regulator *reg_vmmc;
> enum of_gpio_flags flags;
> struct mxs_ssp *ssp;
> + u32 bus_width = 0;
>
> iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
> @@ -682,25 +682,15 @@ static int mxs_mmc_probe(struct platform_device *pdev)
> mmc->caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |
> MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL;
>
> - pdata = mmc_dev(host->mmc)->platform_data;
> - if (!pdata) {
> - u32 bus_width = 0;
> - of_property_read_u32(np, "bus-width", &bus_width);
> - if (bus_width == 4)
> - mmc->caps |= MMC_CAP_4_BIT_DATA;
> - else if (bus_width == 8)
> - mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
> - host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0,
> - &flags);
> - if (flags & OF_GPIO_ACTIVE_LOW)
> - host->wp_inverted = 1;
> - } else {
> - if (pdata->flags & SLOTF_8_BIT_CAPABLE)
> - mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
> - if (pdata->flags & SLOTF_4_BIT_CAPABLE)
> - mmc->caps |= MMC_CAP_4_BIT_DATA;
> - host->wp_gpio = pdata->wp_gpio;
> - }
> + of_property_read_u32(np, "bus-width", &bus_width);
> + if (bus_width == 4)
> + mmc->caps |= MMC_CAP_4_BIT_DATA;
> + else if (bus_width == 8)
> + mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
> + host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
> +
> + if (flags & OF_GPIO_ACTIVE_LOW)
> + host->wp_inverted = 1;
>
> mmc->f_min = 400000;
> mmc->f_max = 288000000;
> --
> 1.7.9.5
>
prev parent reply other threads:[~2012-10-31 6:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-31 3:35 [PATCH] mmc: mxs-mmc: Remove platform data Fabio Estevam
2012-10-31 6:43 ` Shawn Guo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121031064307.GD8100@S2100-06.ap.freescale.net \
--to=shawn.guo@linaro.org \
--cc=cjb@laptop.org \
--cc=fabio.estevam@freescale.com \
--cc=festevam@gmail.com \
--cc=linux-mmc@vger.kernel.org \
--cc=marex@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox