irqchip/i8259: Convert to use irq_set_chained_handler_and_data

AxelLin · KAGA-KOKO · commit a51e80d002b6 · 2015-10-01T16:32:54.000+02:00
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>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -377,8 +377,8 @@ int __init i8259_of_init(struct device_node node, struct device_node parent)`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`domain = __init_i8259_irqs(node);`
`380`		`- irq_set_handler_data(parent_irq, domain);`
`381`		`- irq_set_chained_handler(parent_irq, i8259_irq_dispatch);`
	`380`	`+ irq_set_chained_handler_and_data(parent_irq, i8259_irq_dispatch,`
	`381`	`+ domain);`
`382`	`382`	`return 0;`
`383`	`383`	`}`
`384`	`384`	`IRQCHIP_DECLARE(i8259, "intel,i8259", i8259_of_init);`