aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-24 21:27:37 +0000
committerThomas Gleixner <tglx@linutronix.de>2011-03-25 00:02:52 +0100
commit08f1b807355c8d355885a71e7fd462fe9d499411 (patch)
tree12688748fe007c4a9ee7a1bff7005e8f23d40487
parentb51804bcf0774a8bc6af1e8bb6ae818f4b71173a (diff)
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>
-rw-r--r--drivers/gpio/pl061.c4
-rw-r--r--drivers/gpio/sx150x.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
index 901e4e0..6fcb28c 100644
--- 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 0370ecf..a4f7353 100644
--- 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);
}
}