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-aspeed.c | |
| parent | 027c87fe69599598c6d396b971d2cd9ef45e002e (diff) | |
| parent | ad5c32218879c4b23638488989503d7444822ef2 (diff) | |
| download | linux-2dca9227d356f77d1f6372db213e0446c972a79d.tar.xz | |
Merge branch 'pinconf-rename' into devel
Diffstat (limited to 'drivers/gpio/gpio-aspeed.c')
| -rw-r--r-- | drivers/gpio/gpio-aspeed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index bfc53995064a..c269cc199707 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -536,12 +536,12 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset) if (!have_gpio(gpiochip_get_data(chip), offset)) return -ENODEV; - return pinctrl_request_gpio(chip->base + offset); + return pinctrl_gpio_request(chip->base + offset); } static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset) { - pinctrl_free_gpio(chip->base + offset); + pinctrl_gpio_free(chip->base + offset); } static inline void __iomem *bank_debounce_reg(struct aspeed_gpio *gpio, |