summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-i8259.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-10-01 22:26:44 +0800
committerThomas Gleixner <tglx@linutronix.de>2015-10-01 16:32:54 +0200
commita51e80d002b63bbdaff3229f3ebf4fbb53c75c33 (patch)
treea7e72599fe131ae090a315dfa67c255596e74ac7 /drivers/irqchip/irq-i8259.c
parentbebcb8dab6bac53b6a61a896db03781d1992cadb (diff)
downloadblackbird-op-linux-a51e80d002b63bbdaff3229f3ebf4fbb53c75c33.tar.gz
blackbird-op-linux-a51e80d002b63bbdaff3229f3ebf4fbb53c75c33.zip
irqchip/i8259: Convert to use irq_set_chained_handler_and_data
Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one. Signed-off-by: Axel Lin <axel.lin@ingics.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Link: http://lkml.kernel.org/r/1443709604.12993.0.camel@ingics.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip/irq-i8259.c')
-rw-r--r--drivers/irqchip/irq-i8259.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c
index e484fd255321..6b304eb39bd2 100644
--- a/drivers/irqchip/irq-i8259.c
+++ b/drivers/irqchip/irq-i8259.c
@@ -377,8 +377,8 @@ int __init i8259_of_init(struct device_node *node, struct device_node *parent)
}
domain = __init_i8259_irqs(node);
- irq_set_handler_data(parent_irq, domain);
- irq_set_chained_handler(parent_irq, i8259_irq_dispatch);
+ irq_set_chained_handler_and_data(parent_irq, i8259_irq_dispatch,
+ domain);
return 0;
}
IRQCHIP_DECLARE(i8259, "intel,i8259", i8259_of_init);
OpenPOWER on IntegriCloud