Commit ca9df053 authored by Thierry Reding's avatar Thierry Reding Committed by Linus Walleij

gpio: Move lock_key into struct gpio_irq_chip

In order to consolidate the multiple ways to associate an IRQ chip with
a GPIO chip, move more fields into the new struct gpio_irq_chip.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent dc7b0387
...@@ -1646,7 +1646,7 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq, ...@@ -1646,7 +1646,7 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq,
* This lock class tells lockdep that GPIO irqs are in a different * This lock class tells lockdep that GPIO irqs are in a different
* category than their parents, so it won't report false recursion. * category than their parents, so it won't report false recursion.
*/ */
irq_set_lockdep_class(irq, chip->lock_key); irq_set_lockdep_class(irq, chip->irq.lock_key);
irq_set_chip_and_handler(irq, chip->irq.chip, chip->irq.handler); irq_set_chip_and_handler(irq, chip->irq.chip, chip->irq.handler);
/* Chips that use nested thread handlers have them marked */ /* Chips that use nested thread handlers have them marked */
if (chip->irq.nested) if (chip->irq.nested)
...@@ -1830,7 +1830,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, ...@@ -1830,7 +1830,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip,
gpiochip->irq.handler = handler; gpiochip->irq.handler = handler;
gpiochip->irq.default_type = type; gpiochip->irq.default_type = type;
gpiochip->to_irq = gpiochip_to_irq; gpiochip->to_irq = gpiochip_to_irq;
gpiochip->lock_key = lock_key; gpiochip->irq.lock_key = lock_key;
gpiochip->irq.domain = irq_domain_add_simple(of_node, gpiochip->irq.domain = irq_domain_add_simple(of_node,
gpiochip->ngpio, first_irq, gpiochip->ngpio, first_irq,
&gpiochip_domain_ops, gpiochip); &gpiochip_domain_ops, gpiochip);
......
...@@ -62,6 +62,13 @@ struct gpio_irq_chip { ...@@ -62,6 +62,13 @@ struct gpio_irq_chip {
*/ */
unsigned int default_type; unsigned int default_type;
/**
* @lock_key:
*
* Per GPIO IRQ chip lockdep class.
*/
struct lock_class_key *lock_key;
/** /**
* @parent_handler: * @parent_handler:
* *
...@@ -185,7 +192,6 @@ static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip) ...@@ -185,7 +192,6 @@ static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip)
* safely. * safely.
* @bgpio_dir: shadowed direction register for generic GPIO to clear/set * @bgpio_dir: shadowed direction register for generic GPIO to clear/set
* direction safely. * direction safely.
* @lock_key: per GPIO IRQ chip lockdep class
* *
* A gpio_chip can help platforms abstract various sources of GPIOs so * A gpio_chip can help platforms abstract various sources of GPIOs so
* they can all be accessed through a common programing interface. * they can all be accessed through a common programing interface.
...@@ -255,7 +261,6 @@ struct gpio_chip { ...@@ -255,7 +261,6 @@ struct gpio_chip {
* With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib
* to handle IRQs for most practical cases. * to handle IRQs for most practical cases.
*/ */
struct lock_class_key *lock_key;
/** /**
* @irq: * @irq:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment