linux-kernel - Re: [PATCH] mmc: sdhci-tegra: convert to use GPIO descriptors

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 1 Apr 2015 12:59:43 +0200
From:	Ulf Hansson <ulf.hansson@...aro.org>
To:	Mylene JOSSERAND <josserand.mylene@...il.com>
Cc:	Stephen Warren <swarren@...dotorg.org>,
	Thierry Reding <thierry.reding@...il.com>,
	Alexandre Courbot <gnurou@...il.com>,
	linux-mmc <linux-mmc@...r.kernel.org>,
	"linux-tegra@...r.kernel.org" <linux-tegra@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] mmc: sdhci-tegra: convert to use GPIO descriptors

On 30 March 2015 at 23:39, Mylene JOSSERAND <josserand.mylene@...il.com> wrote:
> Modify the driver to handle GPIOs using the descriptor API.
>
> Signed-off-by: Mylene JOSSERAND <josserand.mylene@...il.com>

Thanks! Applied.

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci-tegra.c |   32 ++++++++------------------------
>  1 file changed, 8 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 93834ab..ad28b49 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -20,11 +20,10 @@
>  #include <linux/io.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> -#include <linux/of_gpio.h>
> -#include <linux/gpio.h>
>  #include <linux/mmc/card.h>
>  #include <linux/mmc/host.h>
>  #include <linux/mmc/slot-gpio.h>
> +#include <linux/gpio/consumer.h>
>
>  #include "sdhci-pltfm.h"
>
> @@ -49,7 +48,7 @@ struct sdhci_tegra_soc_data {
>
>  struct sdhci_tegra {
>         const struct sdhci_tegra_soc_data *soc_data;
> -       int power_gpio;
> +       struct gpio_desc *power_gpio;
>  };
>
>  static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
> @@ -246,17 +245,6 @@ static const struct of_device_id sdhci_tegra_dt_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, sdhci_tegra_dt_match);
>
> -static int sdhci_tegra_parse_dt(struct device *dev)
> -{
> -       struct device_node *np = dev->of_node;
> -       struct sdhci_host *host = dev_get_drvdata(dev);
> -       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> -       struct sdhci_tegra *tegra_host = pltfm_host->priv;
> -
> -       tegra_host->power_gpio = of_get_named_gpio(np, "power-gpios", 0);
> -       return mmc_of_parse(host->mmc);
> -}
> -
>  static int sdhci_tegra_probe(struct platform_device *pdev)
>  {
>         const struct of_device_id *match;
> @@ -286,19 +274,15 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
>         tegra_host->soc_data = soc_data;
>         pltfm_host->priv = tegra_host;
>
> -       rc = sdhci_tegra_parse_dt(&pdev->dev);
> +       rc = mmc_of_parse(host->mmc);
>         if (rc)
>                 goto err_parse_dt;
>
> -       if (gpio_is_valid(tegra_host->power_gpio)) {
> -               rc = devm_gpio_request(&pdev->dev, tegra_host->power_gpio,
> -                                      "sdhci_power");
> -               if (rc) {
> -                       dev_err(mmc_dev(host->mmc),
> -                               "failed to allocate power gpio\n");
> -                       goto err_power_req;
> -               }
> -               gpio_direction_output(tegra_host->power_gpio, 1);
> +       tegra_host->power_gpio = devm_gpiod_get_optional(&pdev->dev, "power",
> +                                                        GPIOD_OUT_HIGH);
> +       if (IS_ERR(tegra_host->power_gpio)) {
> +               rc = PTR_ERR(tegra_host->power_gpio);
> +               goto err_power_req;
>         }
>
>         clk = devm_clk_get(mmc_dev(host->mmc), NULL);
> --
> 1.7.10.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/