hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: sdhci-acpi: convert to use GPIO descriptor API 

The new descriptor based GPIO interface is now the recommended and safer
way of using GPIOs from device drivers. Convert the ACPI SDHCI driver to
use that interface.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Mika Westerberg 2014-01-08 12:40:55 +02:00 committed by Linus Walleij
parent c6c7ee3bca
commit 8787565532
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/mmc/host/sdhci-acpi.c
View File

@ -31,10 +31,9 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio/consumer.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/acpi_gpio.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -199,22 +198,23 @@ static irqreturn_t sdhci_acpi_sd_cd(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int sdhci_acpi_add_own_cd(struct device *dev, int gpio, static int sdhci_acpi_add_own_cd(struct device *dev, struct mmc_host *mmc)
struct mmc_host *mmc)
{ {
struct gpio_desc *desc;
unsigned long flags; unsigned long flags;
int err, irq; int err, irq;
if (gpio < 0) { desc = devm_gpiod_get_index(dev, "sd_cd", 0);
err = gpio; if (IS_ERR(desc)) {
err = PTR_ERR(desc);
goto out; goto out;
} }
err = devm_gpio_request_one(dev, gpio, GPIOF_DIR_IN, "sd_cd"); err = gpiod_direction_input(desc);
if (err) if (err)
goto out; goto out_free;
irq = gpio_to_irq(gpio); irq = gpiod_to_irq(desc);
if (irq < 0) { if (irq < 0) {
err = irq; err = irq;
goto out_free; goto out_free;
@ -228,7 +228,7 @@ static int sdhci_acpi_add_own_cd(struct device *dev, int gpio,
return 0; return 0;
out_free: out_free:
devm_gpio_free(dev, gpio); devm_gpiod_put(dev, desc);
out: out:
dev_warn(dev, "failed to setup card detect wake up\n"); dev_warn(dev, "failed to setup card detect wake up\n");
return err; return err;
@ -236,8 +236,7 @@ out:
#else #else
static int sdhci_acpi_add_own_cd(struct device *dev, int gpio, static int sdhci_acpi_add_own_cd(struct device *dev, struct mmc_host *mmc)
struct mmc_host *mmc)
{ {
return 0; return 0;
} }
@ -254,7 +253,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
struct resource *iomem; struct resource *iomem;
resource_size_t len; resource_size_t len;
const char *hid; const char *hid;
int err, gpio; int err;
if (acpi_bus_get_device(handle, &device)) if (acpi_bus_get_device(handle, &device))
return -ENODEV; return -ENODEV;
@ -279,8 +278,6 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
if (IS_ERR(host)) if (IS_ERR(host))
return PTR_ERR(host); return PTR_ERR(host);
gpio = acpi_get_gpio_by_index(dev, 0, NULL);
c = sdhci_priv(host); c = sdhci_priv(host);
c->host = host; c->host = host;
c->slot = sdhci_acpi_get_slot(handle, hid); c->slot = sdhci_acpi_get_slot(handle, hid);
@ -338,7 +335,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
goto err_free; goto err_free;
if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) { if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) {
if (sdhci_acpi_add_own_cd(dev, gpio, host->mmc)) if (sdhci_acpi_add_own_cd(dev, host->mmc))
c->use_runtime_pm = false; c->use_runtime_pm = false;
} }