irqchip/tango: Set irq handler and data in one go

martin-kaiser · Marc Zyngier · commit 44beda0c357f · 2018-08-20T09:54:44.000+01:00
Replace the two separate calls for setting the irq handler and data with
a single irq_set_chained_handler_and_data() call.

Signed-off-by: Martin Kaiser &lt;martin@kaiser.cx&gt;
Signed-off-by: Marc Zyngier &lt;marc.zyngier@arm.com&gt;
diff --git a/drivers/irqchip/irq-tango.c b/drivers/irqchip/irq-tango.c
@@ -205,8 +205,7 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres,
 
 	tangox_irq_domain_init(dom);
 
-	irq_set_chained_handler(irq, tangox_irq_handler);
-	irq_set_handler_data(irq, dom);
+	irq_set_chained_handler_and_data(irq, tangox_irq_handler, dom);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -205,8 +205,7 @@ static int __init tangox_irq_init(void __iomem base, struct resource baseres,`
`205`	`205`
`206`	`206`	`tangox_irq_domain_init(dom);`
`207`	`207`
`208`		`- irq_set_chained_handler(irq, tangox_irq_handler);`
`209`		`- irq_set_handler_data(irq, dom);`
	`208`	`+ irq_set_chained_handler_and_data(irq, tangox_irq_handler, dom);`
`210`	`209`
`211`	`210`	`return 0;`
`212`	`211`	`}`