All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	Chris Ball <cjb@laptop.org>,
	Dong Aisheng <dong.aisheng@linaro.org>
Subject: Re: [PATCH 07/10] mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host
Date: Tue, 8 May 2012 01:53:44 +0200	[thread overview]
Message-ID: <201205080153.44313.marex@denx.de> (raw)
In-Reply-To: <1336401793-13753-8-git-send-email-shawn.guo@linaro.org>

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.guo@linaro.org>

Otherwise
Acked-by: Marek Vasut <marex@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 = 400000;

Best regards,
Marek Vasut

WARNING: multiple messages have this Message-ID (diff)
From: marex@denx.de (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/10] mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host
Date: Tue, 8 May 2012 01:53:44 +0200	[thread overview]
Message-ID: <201205080153.44313.marex@denx.de> (raw)
In-Reply-To: <1336401793-13753-8-git-send-email-shawn.guo@linaro.org>

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.guo@linaro.org>

Otherwise
Acked-by: Marek Vasut <marex@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 = 400000;

Best regards,
Marek Vasut

  reply	other threads:[~2012-05-07 23:58 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-07 14:43 [PATCH 00/10] Add device tree support for mxs-mmc Shawn Guo
2012-05-07 14:43 ` Shawn Guo
2012-05-07 14:43 ` [PATCH 01/10] mmc: mxs-mmc: use global stmp_device functionality Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 23:41   ` Marek Vasut
2012-05-07 23:41     ` Marek Vasut
2012-05-07 14:43 ` [PATCH 02/10] mmc: mxs-mmc: let ssp_is_old take host as parameter Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 23:43   ` Marek Vasut
2012-05-07 23:43     ` Marek Vasut
2012-05-08 14:32     ` Shawn Guo
2012-05-08 14:32       ` Shawn Guo
2012-05-07 14:43 ` [PATCH 03/10] mmc: mxs-mmc: get rid of the use of cpu_is_xxx Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 23:46   ` Marek Vasut
2012-05-07 23:46     ` Marek Vasut
2012-05-08 14:35     ` Shawn Guo
2012-05-08 14:35       ` Shawn Guo
2012-05-07 14:43 ` [PATCH 04/10] mmc: mxs-mmc: move header from mach into linux folder Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 23:47   ` Marek Vasut
2012-05-07 23:47     ` Marek Vasut
2012-05-07 14:43 ` [PATCH 05/10] mmc: mxs-mmc: use devm_* helper to make cleanup simpler Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 23:49   ` Marek Vasut
2012-05-07 23:49     ` Marek Vasut
2012-05-08 14:38     ` Shawn Guo
2012-05-08 14:38       ` Shawn Guo
2012-05-07 14:43 ` [PATCH 06/10] mmc: mxs-mmc: have dma_channel than dma_res in mxs_mmc_host Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 23:51   ` Marek Vasut
2012-05-07 23:51     ` Marek Vasut
2012-05-07 14:43 ` [PATCH 07/10] mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 23:53   ` Marek Vasut [this message]
2012-05-07 23:53     ` Marek Vasut
2012-05-08 14:40     ` Shawn Guo
2012-05-08 14:40       ` Shawn Guo
2012-05-07 14:43 ` [PATCH 08/10] mmc: mxs-mmc: add device tree support Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 23:58   ` Marek Vasut
2012-05-07 23:58     ` Marek Vasut
2012-05-08 14:43     ` Shawn Guo
2012-05-08 14:43       ` Shawn Guo
2012-05-12 14:44   ` Chris Ball
2012-05-12 14:44     ` Chris Ball
2012-05-13  0:03     ` Shawn Guo
2012-05-13  0:03       ` Shawn Guo
2012-05-13  0:11       ` Chris Ball
2012-05-13  0:11         ` Chris Ball
2012-05-13  0:21         ` Shawn Guo
2012-05-13  0:21           ` Shawn Guo
2012-05-13  0:29           ` Shawn Guo
2012-05-13  0:29             ` Shawn Guo
2012-05-07 14:43 ` [PATCH 09/10] ARM: dts: enable mmc for imx23-evk Shawn Guo
2012-05-07 14:43   ` Shawn Guo
2012-05-07 14:43 ` [PATCH 10/10] ARM: dts: enable mmc for imx28-evk Shawn Guo
2012-05-07 14:43   ` Shawn Guo

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=201205080153.44313.marex@denx.de \
    --to=marex@denx.de \
    --cc=cjb@laptop.org \
    --cc=dong.aisheng@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=shawn.guo@linaro.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.