diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-10-07 13:29:14 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-10-07 13:29:14 +0300 |
| commit | 2dca9227d356f77d1f6372db213e0446c972a79d (patch) | |
| tree | 2d846d70def6e6a0ad774b34972fa12d87862d9d /drivers/gpio/gpio-rcar.c | |
| parent | 027c87fe69599598c6d396b971d2cd9ef45e002e (diff) | |
| parent | ad5c32218879c4b23638488989503d7444822ef2 (diff) | |
| download | linux-2dca9227d356f77d1f6372db213e0446c972a79d.tar.xz | |
Merge branch 'pinconf-rename' into devel
Diffstat (limited to 'drivers/gpio/gpio-rcar.c')
| -rw-r--r-- | drivers/gpio/gpio-rcar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index 1f0871553fd2..43b51045aa47 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -249,7 +249,7 @@ static int gpio_rcar_request(struct gpio_chip *chip, unsigned offset) if (error < 0) return error; - error = pinctrl_request_gpio(chip->base + offset); + error = pinctrl_gpio_request(chip->base + offset); if (error) pm_runtime_put(&p->pdev->dev); @@ -260,7 +260,7 @@ static void gpio_rcar_free(struct gpio_chip *chip, unsigned offset) { struct gpio_rcar_priv *p = gpiochip_get_data(chip); - pinctrl_free_gpio(chip->base + offset); + pinctrl_gpio_free(chip->base + offset); /* * Set the GPIO as an input to ensure that the next GPIO request won't |