gpio/pca953x: Fix warning of enabled interrupts in handler
authorDavid Jander <david@protonic.nl>
Wed, 8 Jun 2011 17:37:45 +0000 (11:37 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 8 Jun 2011 17:37:45 +0000 (11:37 -0600)
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>
drivers/gpio/gpio-pca953x.c

index 17e55701394bca96558a6e8131db3b2a769846d7..4b8446e98de5c31f5cc8100796293e29299eeec7 100644 (file)
@@ -437,7 +437,7 @@ static irqreturn_t pca953x_irq_handler(int irq, void *devid)
 
        do {
                level = __ffs(pending);
-               generic_handle_irq(level + chip->irq_base);
+               handle_nested_irq(level + chip->irq_base);
 
                pending &= ~(1 << level);
        } while (pending);
@@ -485,8 +485,8 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
 
                        irq_clear_status_flags(irq, IRQ_NOREQUEST);
                        irq_set_chip_data(irq, chip);
-                       irq_set_chip_and_handler(irq, &pca953x_irq_chip,
-                                                handle_simple_irq);
+                       irq_set_chip(irq, &pca953x_irq_chip);
+                       irq_set_nested_thread(irq, true);
 #ifdef CONFIG_ARM
                        set_irq_flags(irq, IRQF_VALID);
 #else