Re: [PATCH 07/10] mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host

2012-05-08 Thread Shawn Guo 
On Tue, May 08, 2012 at 01:53:44AM +0200, Marek Vasut wrote:
 Dear Shawn Guo,
 
  It has wp_gpio copied in struct mxs_mmc_host from platform_data,
 
 Copy wp_gpio into struct ...
 
Updated.

  so that the use of platform_data can be limited in probe function,
  which will ease the device tree probe.
  
  Signed-off-by: Shawn Guo shawn@linaro.org
 
 Otherwise
 Acked-by: Marek Vasut ma...@denx.de
 
Thanks.

-- 
Regards,
Shawn
--
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 07/10] mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host

2012-05-07 Thread Shawn Guo 
It has wp_gpio copied in struct mxs_mmc_host from platform_data,
so that the use of platform_data can be limited in probe function,
which will ease the device tree probe.

Signed-off-by: Shawn Guo shawn@linaro.org
---
 drivers/mmc/host/mxs-mmc.c |   11 ---
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index e905721..66f792a 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -160,21 +160,17 @@ struct mxs_mmc_host {
unsigned char   bus_width;
spinlock_t  lock;
int sdio_irq_en;
+   int wp_gpio;
 };
 
 static int mxs_mmc_get_ro(struct mmc_host *mmc)
 {
struct mxs_mmc_host *host = mmc_priv(mmc);
-   struct mxs_mmc_platform_data *pdata =
-   mmc_dev(host-mmc)-platform_data;
 
-   if (!pdata)
-   return -EFAULT;
-
-   if (!gpio_is_valid(pdata-wp_gpio))
+   if (!gpio_is_valid(host-wp_gpio))
return -EINVAL;
 
-   return gpio_get_value(pdata-wp_gpio);
+   return gpio_get_value(host-wp_gpio);
 }
 
 static int mxs_mmc_get_cd(struct mmc_host *mmc)
@@ -758,6 +754,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
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;
}
 
mmc-f_min = 40;
-- 
1.7.5.4

--
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 07/10] mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host

2012-05-07 Thread Marek Vasut 
Dear Shawn Guo,

 It has wp_gpio copied in struct mxs_mmc_host from platform_data,

Copy wp_gpio into struct ...

 so that the use of platform_data can be limited in probe function,
 which will ease the device tree probe.
 
 Signed-off-by: Shawn Guo shawn@linaro.org

Otherwise
Acked-by: Marek Vasut ma...@denx.de

 ---
  drivers/mmc/host/mxs-mmc.c |   11 ---
  1 files changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
 index e905721..66f792a 100644
 --- a/drivers/mmc/host/mxs-mmc.c
 +++ b/drivers/mmc/host/mxs-mmc.c
 @@ -160,21 +160,17 @@ struct mxs_mmc_host {
   unsigned char   bus_width;
   spinlock_t  lock;
   int sdio_irq_en;
 + int wp_gpio;
  };
 
  static int mxs_mmc_get_ro(struct mmc_host *mmc)
  {
   struct mxs_mmc_host *host = mmc_priv(mmc);
 - struct mxs_mmc_platform_data *pdata =
 - mmc_dev(host-mmc)-platform_data;
 
 - if (!pdata)
 - return -EFAULT;
 -
 - if (!gpio_is_valid(pdata-wp_gpio))
 + if (!gpio_is_valid(host-wp_gpio))
   return -EINVAL;
 
 - return gpio_get_value(pdata-wp_gpio);
 + return gpio_get_value(host-wp_gpio);
  }
 
  static int mxs_mmc_get_cd(struct mmc_host *mmc)
 @@ -758,6 +754,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
   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;
   }
 
   mmc-f_min = 40;

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