diff options
author | David Jander <david@protonic.nl> | 2011-06-08 13:37:45 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 13:37:45 -0400 |
commit | 6dd599f8af0166805951f4421a78ba716d78321a (patch) | |
tree | 2a319eb6c912711c3c1d54e2dcb79c9f44c9f4bd /drivers/gpio/gpio-pca953x.c | |
parent | 17e8b42c17c3e9735ea03c4e6b67cedf5de170f4 (diff) |
gpio/pca953x: Fix warning of enabled interrupts in handler
When using nested threaded irqs, use handle_nested_irq(). This function
does not call the chip handler, so no handler is set.
Signed-off-by: David Jander <david@protonic.nl>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/gpio/gpio-pca953x.c')
-rw-r--r-- | drivers/gpio/gpio-pca953x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 17e55701394b..4b8446e98de5 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c | |||
@@ -437,7 +437,7 @@ static irqreturn_t pca953x_irq_handler(int irq, void *devid) | |||
437 | 437 | ||
438 | do { | 438 | do { |
439 | level = __ffs(pending); | 439 | level = __ffs(pending); |
440 | generic_handle_irq(level + chip->irq_base); | 440 | handle_nested_irq(level + chip->irq_base); |
441 | 441 | ||
442 | pending &= ~(1 << level); | 442 | pending &= ~(1 << level); |
443 | } while (pending); | 443 | } while (pending); |
@@ -485,8 +485,8 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, | |||
485 | 485 | ||
486 | irq_clear_status_flags(irq, IRQ_NOREQUEST); | 486 | irq_clear_status_flags(irq, IRQ_NOREQUEST); |
487 | irq_set_chip_data(irq, chip); | 487 | irq_set_chip_data(irq, chip); |
488 | irq_set_chip_and_handler(irq, &pca953x_irq_chip, | 488 | irq_set_chip(irq, &pca953x_irq_chip); |
489 | handle_simple_irq); | 489 | irq_set_nested_thread(irq, true); |
490 | #ifdef CONFIG_ARM | 490 | #ifdef CONFIG_ARM |
491 | set_irq_flags(irq, IRQF_VALID); | 491 | set_irq_flags(irq, IRQF_VALID); |
492 | #else | 492 | #else |