Re: [PATCH v2] mmc: mxs-mmc: Remove platform data

[Chris Ball]

Hi,

On Wed, Oct 31 2012, Shawn Guo wrote:
> On Wed, Oct 31, 2012 at 09:22:58AM -0200, Fabio Estevam wrote:
>> From: Fabio Estevam 
>> 
>> 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 

Thanks, pushed to mmc-next for 3.8 with ACKs from Marek and Shawn.

- Chris.
-- 
Chris Ball  
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] mmc: mxs-mmc: Remove platform data

[Marek Vasut]

Dear Fabio Estevam,

> From: Fabio Estevam 
> 
> 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 
[...]

You might want to do the same for MXS SPI driver.

Acked-by: Marek Vasut 

Best regards,
Marek Vasut
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] mmc: mxs-mmc: Remove platform data

[Fabio Estevam]

On Wed, Oct 31, 2012 at 1:45 PM, Shawn Guo  wrote:

> Since you are here, you may also want to remove the "if (np)" check for
> non-dt probe case getting devid and dma_channel.  As the result,
> mxs_ssp_ids can be removed as well.
>
> It could be another patch though, so for this one:
>
> Acked-by: Shawn Guo 

Ok, will do it as a separate patch after this one gets applied.

Regards,

Fabio Estevam
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] mmc: mxs-mmc: Remove platform data

[Shawn Guo]

On Wed, Oct 31, 2012 at 09:22:58AM -0200, Fabio Estevam wrote:
> From: Fabio Estevam 
> 
> 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 
> 
> Changes since v1:
> - Also remove mxs_mmc_platform_data and linux/mmc/mxs-mmc.h, which was used 
> only
> to include mxs_mmc_platform_data definition.
> 
>  drivers/mmc/host/mxs-mmc.c  |   31 ++-
>  include/linux/mmc/mxs-mmc.h |   19 ---
>  2 files changed, 10 insertions(+), 40 deletions(-)
>  delete mode 100644 include/linux/mmc/mxs-mmc.h
> 
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 80d1e6d..206fe49 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -43,7 +43,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  
>  #define DRIVER_NAME  "mxs-mmc"
> @@ -593,13 +592,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 +681,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;
> - }

Since you are here, you may also want to remove the "if (np)" check for
non-dt probe case getting devid and dma_channel.  As the result,
mxs_ssp_ids can be removed as well.

It could be another patch though, so for this one:

Acked-by: Shawn Guo 

> + 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 = 40;
>   mmc->f_max = 28800;
> diff --git a/include/linux/mmc/mxs-mmc.h b/include/linux/mmc/mxs-mmc.h
> deleted file mode 100644
> index 7c2ad3a..000
> -- 
> 1.7.9.5
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2] mmc: mxs-mmc: Remove platform data

[Fabio Estevam]

From: Fabio Estevam 

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 

Changes since v1:
- Also remove mxs_mmc_platform_data and linux/mmc/mxs-mmc.h, which was used only
to include mxs_mmc_platform_data definition.

 drivers/mmc/host/mxs-mmc.c  |   31 ++-
 include/linux/mmc/mxs-mmc.h |   19 ---
 2 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100644 include/linux/mmc/mxs-mmc.h

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 80d1e6d..206fe49 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -43,7 +43,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #define DRIVER_NAME"mxs-mmc"
@@ -593,13 +592,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 +681,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 = 40;
mmc->f_max = 28800;
diff --git a/include/linux/mmc/mxs-mmc.h b/include/linux/mmc/mxs-mmc.h
deleted file mode 100644
index 7c2ad3a..000
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html