gpio: rename gpio_lock_as_irq to gpiochip_lock_as_irq

This function actually operates on a gpio_chip, so its prefix should
reflect that fact for consistency with other functions defined in
gpio/driver.h.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 354a81d40925..608671704522 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1472,7 +1472,7 @@ static unsigned int gpio_irq_startup(struct irq_data *d)
         unsigned        pin = d->hwirq;
         int ret;
 
-        ret = gpio_lock_as_irq(&at91_gpio->chip, pin);
+        ret = gpiochip_lock_as_irq(&at91_gpio->chip, pin);
         if (ret) {
                 dev_err(at91_gpio->chip.dev, "unable to lock pind %lu IRQ\n",
                         d->hwirq);
@@ -1488,7 +1488,7 @@ static void gpio_irq_shutdown(struct irq_data *d)
         unsigned        pin = d->hwirq;
 
         gpio_irq_mask(d);
-        gpio_unlock_as_irq(&at91_gpio->chip, pin);
+        gpiochip_unlock_as_irq(&at91_gpio->chip, pin);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c
index d7154ed0b0eb..fa54a2d1c966 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos.c
+++ b/drivers/pinctrl/samsung/pinctrl-exynos.c
@@ -180,7 +180,7 @@ static int exynos_irq_request_resources(struct irq_data *irqd)
         unsigned int con;
         int ret;
 
-        ret = gpio_lock_as_irq(&bank->gpio_chip, irqd->hwirq);
+        ret = gpiochip_lock_as_irq(&bank->gpio_chip, irqd->hwirq);
         if (ret) {
                 dev_err(bank->gpio_chip.dev, "unable to lock pin %s-%lu IRQ\n",
                         bank->name, irqd->hwirq);
@@ -233,7 +233,7 @@ static void exynos_irq_release_resources(struct irq_data *irqd)
 
         spin_unlock_irqrestore(&bank->slock, flags);
 
-        gpio_unlock_as_irq(&bank->gpio_chip, irqd->hwirq);
+        gpiochip_unlock_as_irq(&bank->gpio_chip, irqd->hwirq);
 }
 
 /*
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index ef9d804e55de..3d0744337736 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -553,7 +553,7 @@ static int sunxi_pinctrl_irq_request_resources(struct irq_data *d)
         if (!func)
                 return -EINVAL;
 
-        ret = gpio_lock_as_irq(pctl->chip,
+        ret = gpiochip_lock_as_irq(pctl->chip,
                         pctl->irq_array[d->hwirq] - pctl->desc->pin_base);
         if (ret) {
                 dev_err(pctl->dev, "unable to lock HW IRQ %lu for IRQ\n",
@@ -571,8 +571,8 @@ static void sunxi_pinctrl_irq_release_resources(struct irq_data *d)
 {
         struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);
 
-        gpio_unlock_as_irq(pctl->chip,
-                           pctl->irq_array[d->hwirq] - pctl->desc->pin_base);
+        gpiochip_unlock_as_irq(pctl->chip,
+                              pctl->irq_array[d->hwirq] - pctl->desc->pin_base);
 }
 
 static int sunxi_pinctrl_irq_set_type(struct irq_data *d, unsigned int type)