gpio: Fold irq_set_chip/irq_set_handler to irq_set_chip_and_handler

Converted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
LKML-Reference: <20110324212509.118888535@linutronix.de>

diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
index 901e4e06b377f487128f9fc06e26395988fb1226..6fcb28cdd862af40527d79cb80b14393ae410d5d 100644 (file)
--- a/drivers/gpio/pl061.c
+++ b/drivers/gpio/pl061.c
@@ -315,8 +315,8 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
                else
                        pl061_direction_input(&chip->gc, i);
 
-               irq_set_chip(i + chip->irq_base, &pl061_irqchip);
-               irq_set_handler(i + chip->irq_base, handle_simple_irq);
+               irq_set_chip_and_handler(i + chip->irq_base, &pl061_irqchip,
+                                        handle_simple_irq);
                set_irq_flags(i+chip->irq_base, IRQF_VALID);
                irq_set_chip_data(i + chip->irq_base, chip);
        }

diff --git a/drivers/gpio/sx150x.c b/drivers/gpio/sx150x.c
index 0370ecf63edfcd3b1afbb0d4a6d9155b92e48a04..a4f73534394e4f37e13b6998e50c64dde43b7f3e 100644 (file)
--- a/drivers/gpio/sx150x.c
+++ b/drivers/gpio/sx150x.c
@@ -583,8 +583,7 @@ static void sx150x_remove_irq_chip(struct sx150x_chip *chip)
 
        for (n = 0; n < chip->dev_cfg->ngpios; ++n) {
                irq = chip->irq_base + n;
-               irq_set_handler(irq, NULL);
-               irq_set_chip(irq, NULL);
+               irq_set_chip_and_handler(irq, NULL, NULL);
        }
 }