mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
gpio: Move irq_default_type to 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: Thierry Reding <[email protected]> Acked-by: Grygorii Strashko <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
This commit is contained in:
parent
c7a0aa5952
commit
3634eeb0fe
2 changed files with 11 additions and 6 deletions
|
|
@ -1656,8 +1656,8 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq,
|
|||
* No set-up of the hardware will happen if IRQ_TYPE_NONE
|
||||
* is passed as default type.
|
||||
*/
|
||||
if (chip->irq_default_type != IRQ_TYPE_NONE)
|
||||
irq_set_irq_type(irq, chip->irq_default_type);
|
||||
if (chip->irq.default_type != IRQ_TYPE_NONE)
|
||||
irq_set_irq_type(irq, chip->irq.default_type);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1821,7 +1821,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip,
|
|||
|
||||
gpiochip->irq.chip = irqchip;
|
||||
gpiochip->irq.handler = handler;
|
||||
gpiochip->irq_default_type = type;
|
||||
gpiochip->irq.default_type = type;
|
||||
gpiochip->to_irq = gpiochip_to_irq;
|
||||
gpiochip->lock_key = lock_key;
|
||||
gpiochip->irq.domain = irq_domain_add_simple(of_node,
|
||||
|
|
|
|||
Loading…
Reference in a new issue