commit 08f1b807355c8d355885a71e7fd462fe9d499411
author Thomas Gleixner <tglx@linutronix.de> Thu Mar 24 21:27:37 2011 +0000
committer Thomas Gleixner <tglx@linutronix.de> Fri Mar 25 00:02:52 2011 +0100
tree 12688748fe007c4a9ee7a1bff7005e8f23d40487
parent b51804bcf0774a8bc6af1e8bb6ae818f4b71173a

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>

drivers/gpio/pl061.c

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 @@
 		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);
 	}

drivers/gpio/sx150x.c

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 @@
 
 	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);
 	}
 }