gpio: tag line labels used for interrupts

When a GPIO line is marked as used for an interrupt, it is
helpful to set the label to "interrupt" so we know what is
going on when inspecting the lines.

If a GPIO is already properly named by gpiod_get*() we don't
need to do this. It only happens when a line is used from
the irqchip side of a GPIO driver without communicating
with the GPIO side, such as when gpiochip is used as interrupt
provider in the device tree.

If the line is still marked as used by "interrupt" when we
unmark it as used by an interrupt, also remove this label
from the descriptor.

Also shape up the code around unmarking IRQ lines.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index b7452c5223be60b3d7576e95907c4532a50555e6..e97e88e48191e512d1d3a689f7e5b3f249d06e48 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2685,6 +2685,15 @@ int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
        }
 
        set_bit(FLAG_USED_AS_IRQ, &desc->flags);
+
+       /*
+        * If the consumer has not set up a label (such as when the
+        * IRQ is referenced from .to_irq()) we set up a label here
+        * so it is clear this is used as an interrupt.
+        */
+       if (!desc->label)
+               desc_set_label(desc, "interrupt");
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(gpiochip_lock_as_irq);
@@ -2699,10 +2708,17 @@ EXPORT_SYMBOL_GPL(gpiochip_lock_as_irq);
  */
 void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)
 {
-       if (offset >= chip->ngpio)
+       struct gpio_desc *desc;
+
+       desc = gpiochip_get_desc(chip, offset);
+       if (IS_ERR(desc))
                return;
 
-       clear_bit(FLAG_USED_AS_IRQ, &chip->gpiodev->descs[offset].flags);
+       clear_bit(FLAG_USED_AS_IRQ, &desc->flags);
+
+       /* If we only had this marking, erase it */
+       if (desc->label && !strcmp(desc->label, "interrupt"))
+               desc_set_label(desc, NULL);
 }
 EXPORT_SYMBOL_GPL(gpiochip_unlock_as_irq);