summaryrefslogtreecommitdiff
path: root/drivers/mfd/htc-i2cpld.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-25 11:12:35 +0000
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-27 00:09:52 +0100
commitd6f7ce9f7fde069424e6400c31717ef34aab7e5f (patch)
tree22afbe82d756093ffa147ecd40b88f146c93dce3 /drivers/mfd/htc-i2cpld.c
parentd5bb122165981aed327845c32a9916d1b8ae0e4b (diff)
mfd: Fold irq_set_chip/irq_set_handler
Use the combined irq_set_chip_and_handler() function instead. Converted with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/htc-i2cpld.c')
-rw-r--r--drivers/mfd/htc-i2cpld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index 9ba2a2a15dcb..d55065cc324c 100644
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -348,9 +348,9 @@ static int __devinit htcpld_setup_chip_irq(
/* Setup irq handlers */
irq_end = chip->irq_start + chip->nirqs;
for (irq = chip->irq_start; irq < irq_end; irq++) {
- irq_set_chip(irq, &htcpld_muxed_chip);
+ irq_set_chip_and_handler(irq, &htcpld_muxed_chip,
+ handle_simple_irq);
irq_set_chip_data(irq, chip);
- irq_set_handler(irq, handle_simple_irq);
#ifdef CONFIG_ARM
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
#else