| Message ID | 1351654547-615-1-git-send-email-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; 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;