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>

diff --git a/Documentation/gpio/driver.txt b/Documentation/gpio/driver.txt
index 31e0b5db55d89a1e1d9e8da5e9f3fef2a4694450..90d0f6aba7a6848a3043ff7a7de3913118a98461 100644 (file)
--- a/Documentation/gpio/driver.txt
+++ b/Documentation/gpio/driver.txt
@@ -158,12 +158,12 @@ Locking IRQ usage
 Input GPIOs can be used as IRQ signals. When this happens, a driver is requested
 to mark the GPIO as being used as an IRQ:
 
-       int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
+       int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
 
 This will prevent the use of non-irq related GPIO APIs until the GPIO IRQ lock
 is released:
 
-       void gpio_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)
+       void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)
 
 When implementing an irqchip inside a GPIO driver, these two functions should
 typically be called in the .startup() and .shutdown() callbacks from the

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index de0801e9767a098484542f22fea1c9e02cdb0fa5..56fb5ce47aa1661b538f0b494e8df74d7ddd872d 100644 (file)
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -470,7 +470,7 @@ static int bcm_kona_gpio_irq_reqres(struct irq_data *d)
 {
        struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);
 
-       if (gpio_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq)) {
+       if (gpiochip_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq)) {
                dev_err(kona_gpio->gpio_chip.dev,
                        "unable to lock HW IRQ %lu for IRQ\n",
                        d->hwirq);
@@ -483,7 +483,7 @@ static void bcm_kona_gpio_irq_relres(struct irq_data *d)
 {
        struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);
 
-       gpio_unlock_as_irq(&kona_gpio->gpio_chip, d->hwirq);
+       gpiochip_unlock_as_irq(&kona_gpio->gpio_chip, d->hwirq);
 }
 
 static struct irq_chip bcm_gpio_irq_chip = {

diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index b43cd84b61f161302d592dd2d0cc29161586c0fa..4beb37839392323d6c15ab3619763d37135c0f1a 100644 (file)
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -194,7 +194,7 @@ static int dwapb_irq_reqres(struct irq_data *d)
        struct dwapb_gpio *gpio = igc->private;
        struct bgpio_chip *bgc = &gpio->ports[0].bgc;
 
-       if (gpio_lock_as_irq(&bgc->gc, irqd_to_hwirq(d))) {
+       if (gpiochip_lock_as_irq(&bgc->gc, irqd_to_hwirq(d))) {
                dev_err(gpio->dev, "unable to lock HW IRQ %lu for IRQ\n",
                        irqd_to_hwirq(d));
                return -EINVAL;
@@ -208,7 +208,7 @@ static void dwapb_irq_relres(struct irq_data *d)
        struct dwapb_gpio *gpio = igc->private;
        struct bgpio_chip *bgc = &gpio->ports[0].bgc;
 
-       gpio_unlock_as_irq(&bgc->gc, irqd_to_hwirq(d));
+       gpiochip_unlock_as_irq(&bgc->gc, irqd_to_hwirq(d));
 }
 
 static int dwapb_irq_set_type(struct irq_data *d, u32 type)

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index fe49ec3cdb7d971329f88721daf606569696a180..21d34d4d473dcefe1654fb4cf0b240d83d405440 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -103,7 +103,7 @@ static int em_gio_irq_reqres(struct irq_data *d)
 {
        struct em_gio_priv *p = irq_data_get_irq_chip_data(d);
 
-       if (gpio_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) {
+       if (gpiochip_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) {
                dev_err(p->gpio_chip.dev,
                        "unable to lock HW IRQ %lu for IRQ\n",
                        irqd_to_hwirq(d));
@@ -116,7 +116,7 @@ static void em_gio_irq_relres(struct irq_data *d)
 {
        struct em_gio_priv *p = irq_data_get_irq_chip_data(d);
 
-       gpio_unlock_as_irq(&p->gpio_chip, irqd_to_hwirq(d));
+       gpiochip_unlock_as_irq(&p->gpio_chip, irqd_to_hwirq(d));
 }
 
 

diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 8488e2fd307c399ee24bad8284f0c16a43c803fd..468d10d2ac1e3a8b12ab73a0ec3fb89692b3e577 100644 (file)
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -444,7 +444,7 @@ static int mcp23s08_irq_reqres(struct irq_data *data)
 {
        struct mcp23s08 *mcp = irq_data_get_irq_chip_data(data);
 
-       if (gpio_lock_as_irq(&mcp->chip, data->hwirq)) {
+       if (gpiochip_lock_as_irq(&mcp->chip, data->hwirq)) {
                dev_err(mcp->chip.dev,
                        "unable to lock HW IRQ %lu for IRQ usage\n",
                        data->hwirq);
@@ -458,7 +458,7 @@ static void mcp23s08_irq_relres(struct irq_data *data)
 {
        struct mcp23s08 *mcp = irq_data_get_irq_chip_data(data);
 
-       gpio_unlock_as_irq(&mcp->chip, data->hwirq);
+       gpiochip_unlock_as_irq(&mcp->chip, data->hwirq);
 }
 
 static struct irq_chip mcp23s08_irq_chip = {

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 415682f692145ded2cc02653d2286a7c0f3665f5..a38686786e461d2bfd517bb5c6db26e4ca910920 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -800,7 +800,7 @@ static void omap_gpio_irq_shutdown(struct irq_data *d)
        unsigned offset = GPIO_INDEX(bank, gpio);
 
        spin_lock_irqsave(&bank->lock, flags);
-       gpio_unlock_as_irq(&bank->chip, offset);
+       gpiochip_unlock_as_irq(&bank->chip, offset);
        bank->irq_usage &= ~(BIT(offset));
        omap_disable_gpio_module(bank, offset);
        omap_reset_gpio(bank, gpio);

diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 4e8fb8261a8754cdfee323adad33d7218e951444..61bcfa93606d0b9c176b1589bcfcb7a67303492c 100644 (file)
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -233,7 +233,7 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type)
                return -EINVAL;
        }
 
-       ret = gpio_lock_as_irq(&tegra_gpio_chip, gpio);
+       ret = gpiochip_lock_as_irq(&tegra_gpio_chip, gpio);
        if (ret) {
                dev_err(dev, "unable to lock Tegra GPIO %d as IRQ\n", gpio);
                return ret;
@@ -263,7 +263,7 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d)
 {
        int gpio = d->hwirq;
 
-       gpio_unlock_as_irq(&tegra_gpio_chip, gpio);
+       gpiochip_unlock_as_irq(&tegra_gpio_chip, gpio);
 }
 
 static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)

diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index dbf28fa03f6732e339f485b05002ef1b290fc6e8..cec55226143dd2263b3c0cc8c043b08faf680a1d 100644 (file)
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -138,7 +138,7 @@ static void unmask_giuint_low(struct irq_data *d)
 
 static unsigned int startup_giuint(struct irq_data *data)
 {
-       if (gpio_lock_as_irq(&vr41xx_gpio_chip, data->hwirq))
+       if (gpiochip_lock_as_irq(&vr41xx_gpio_chip, data->hwirq))
                dev_err(vr41xx_gpio_chip.dev,
                        "unable to lock HW IRQ %lu for IRQ\n",
                        data->hwirq);
@@ -150,7 +150,7 @@ static unsigned int startup_giuint(struct irq_data *data)
 static void shutdown_giuint(struct irq_data *data)
 {
        mask_giuint_low(data);
-       gpio_unlock_as_irq(&vr41xx_gpio_chip, data->hwirq);
+       gpiochip_unlock_as_irq(&vr41xx_gpio_chip, data->hwirq);
 }
 
 static struct irq_chip giuint_low_irq_chip = {

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 05c6275da224bcf6d287f51da038bdb1c8438962..349a7552dd2346cf4c13a35e098857d9e17c9222 100644 (file)
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -153,7 +153,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
 
        gpiod_direction_input(desc);
 
-       ret = gpio_lock_as_irq(chip, pin);
+       ret = gpiochip_lock_as_irq(chip, pin);
        if (ret) {
                dev_err(chip->dev, "Failed to lock GPIO as interrupt\n");
                goto fail_free_desc;
@@ -209,7 +209,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
 fail_free_event:
        kfree(event);
 fail_unlock_irq:
-       gpio_unlock_as_irq(chip, pin);
+       gpiochip_unlock_as_irq(chip, pin);
 fail_free_desc:
        gpiochip_free_own_desc(desc);
 
@@ -280,7 +280,7 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip)
                desc = event->desc;
                if (WARN_ON(IS_ERR(desc)))
                        continue;
-               gpio_unlock_as_irq(chip, event->pin);
+               gpiochip_unlock_as_irq(chip, event->pin);
                gpiochip_free_own_desc(desc);
                list_del(&event->node);
                kfree(event);

diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index 5f2150b619a72127b11942d712599d053ff62676..781fbed00fc3c6755a0c84364cbb396a5152116e 100644 (file)
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -161,7 +161,7 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev,
        desc->flags &= ~GPIO_TRIGGER_MASK;
 
        if (!gpio_flags) {
-               gpio_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
+               gpiochip_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
                ret = 0;
                goto free_id;
        }
@@ -200,7 +200,7 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev,
        if (ret < 0)
                goto free_id;
 
-       ret = gpio_lock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
+       ret = gpiochip_lock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
        if (ret < 0) {
                gpiod_warn(desc, "failed to flag the GPIO for IRQ\n");
                goto free_id;

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index e8e98ca25ec7e468c95164a791866ae477f74f2b..50e18a4b3a9f707948b63f710390105714b3fc88 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -495,7 +495,7 @@ static int gpiochip_irq_reqres(struct irq_data *d)
 {
        struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
 
-       if (gpio_lock_as_irq(chip, d->hwirq)) {
+       if (gpiochip_lock_as_irq(chip, d->hwirq)) {
                chip_err(chip,
                        "unable to lock HW IRQ %lu for IRQ\n",
                        d->hwirq);
@@ -508,7 +508,7 @@ static void gpiochip_irq_relres(struct irq_data *d)
 {
        struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
 
-       gpio_unlock_as_irq(chip, d->hwirq);
+       gpiochip_unlock_as_irq(chip, d->hwirq);
 }
 
 static int gpiochip_to_irq(struct gpio_chip *chip, unsigned offset)
@@ -1332,14 +1332,14 @@ int gpiod_to_irq(const struct gpio_desc *desc)
 EXPORT_SYMBOL_GPL(gpiod_to_irq);
 
 /**
- * gpio_lock_as_irq() - lock a GPIO to be used as IRQ
+ * gpiochip_lock_as_irq() - lock a GPIO to be used as IRQ
  * @chip: the chip the GPIO to lock belongs to
  * @offset: the offset of the GPIO to lock as IRQ
  *
  * This is used directly by GPIO drivers that want to lock down
  * a certain GPIO line to be used for IRQs.
  */
-int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
+int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
 {
        if (offset >= chip->ngpio)
                return -EINVAL;
@@ -1354,24 +1354,24 @@ int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
        set_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
        return 0;
 }
-EXPORT_SYMBOL_GPL(gpio_lock_as_irq);
+EXPORT_SYMBOL_GPL(gpiochip_lock_as_irq);
 
 /**
- * gpio_unlock_as_irq() - unlock a GPIO used as IRQ
+ * gpiochip_unlock_as_irq() - unlock a GPIO used as IRQ
  * @chip: the chip the GPIO to lock belongs to
  * @offset: the offset of the GPIO to lock as IRQ
  *
  * This is used directly by GPIO drivers that want to indicate
  * that a certain GPIO is no longer used exclusively for IRQ.
  */
-void gpio_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)
+void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)
 {
        if (offset >= chip->ngpio)
                return;
 
        clear_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
 }
-EXPORT_SYMBOL_GPL(gpio_unlock_as_irq);
+EXPORT_SYMBOL_GPL(gpiochip_unlock_as_irq);
 
 /**
  * gpiod_get_raw_value_cansleep() - return a gpio's raw value

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 354a81d409258102213d3fa1469ce72e2df49885..608671704522cdc0a651eddc3d5d14ab4a8351ff 100644 (file)
--- 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 d7154ed0b0eb19347fa1bd26ca82dee99a4c9e87..fa54a2d1c966d37a53e23234eea4ba8c323b543c 100644 (file)
--- 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 ef9d804e55de5202a3cc2a3684c2c1153ac26da4..3d07443377362f0b84f59d971dcf73ecdf1d236c 100644 (file)
--- 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)

diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 85aa5d0b9357ae2b26d29e858d63329bfc6e9d7f..ab81339a8590a8bb8f4b889b501e7eb928878cc5 100644 (file)
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -216,14 +216,15 @@ static inline int gpio_to_irq(unsigned gpio)
        return -EINVAL;
 }
 
-static inline int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
+static inline int gpiochip_lock_as_irq(struct gpio_chip *chip,
+                                      unsigned int offset)
 {
        WARN_ON(1);
        return -EINVAL;
 }
 
-static inline void gpio_unlock_as_irq(struct gpio_chip *chip,
-                                     unsigned int offset)
+static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip,
+                                         unsigned int offset)
 {
        WARN_ON(1);
 }

diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 249db3057e4dc0454f8947f305e6e3b94e138719..ff200a75501e13bfbfb8816665c5dc8b9f763902 100644 (file)
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -149,8 +149,8 @@ extern struct gpio_chip *gpiochip_find(void *data,
                              int (*match)(struct gpio_chip *chip, void *data));
 
 /* lock/unlock as IRQ */
-int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
-void gpio_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
+int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
+void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
 
 struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);