diff options
author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2016-03-25 10:27:09 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 02:54:00 -0400 |
commit | dedf24a28da67f6bf814cb5d05a5d12bb39093dc (patch) | |
tree | 1e76d48ac9d612e902ce3abf8272cdb670816159 /drivers/mfd | |
parent | 073d4aca342029fc62fefa500bb11a556c5f7223 (diff) |
mfd: arizona: Fix lockdep recursion warning on set_irq_wake
Avoid a false recursive locking warning from lockdep by adding a lock
class for the arizona IRQ chip.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/arizona-irq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c index 5fef014920a3..edeb4951366a 100644 --- a/drivers/mfd/arizona-irq.c +++ b/drivers/mfd/arizona-irq.c | |||
@@ -168,12 +168,15 @@ static struct irq_chip arizona_irq_chip = { | |||
168 | .irq_set_wake = arizona_irq_set_wake, | 168 | .irq_set_wake = arizona_irq_set_wake, |
169 | }; | 169 | }; |
170 | 170 | ||
171 | static struct lock_class_key arizona_irq_lock_class; | ||
172 | |||
171 | static int arizona_irq_map(struct irq_domain *h, unsigned int virq, | 173 | static int arizona_irq_map(struct irq_domain *h, unsigned int virq, |
172 | irq_hw_number_t hw) | 174 | irq_hw_number_t hw) |
173 | { | 175 | { |
174 | struct arizona *data = h->host_data; | 176 | struct arizona *data = h->host_data; |
175 | 177 | ||
176 | irq_set_chip_data(virq, data); | 178 | irq_set_chip_data(virq, data); |
179 | irq_set_lockdep_class(virq, &arizona_irq_lock_class); | ||
177 | irq_set_chip_and_handler(virq, &arizona_irq_chip, handle_simple_irq); | 180 | irq_set_chip_and_handler(virq, &arizona_irq_chip, handle_simple_irq); |
178 | irq_set_nested_thread(virq, 1); | 181 | irq_set_nested_thread(virq, 1); |
179 | irq_set_noprobe(virq); | 182 | irq_set_noprobe(virq); |