Skip to content

Commit 695d702

Browse files
Chen Nichleroy
authored andcommitted
soc: fsl: qe: Consolidate chained IRQ handler install/remove
Chained irq handlers usually set up handler data as well. irq_set_chained_handler_and_data() can set both under irq_desc->lock. Replace the two calls with one. Signed-off-by: Chen Ni <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christophe Leroy <[email protected]>
1 parent 61ddf5f commit 695d702

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

drivers/soc/fsl/qe/qe_ic.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -455,13 +455,11 @@ static int qe_ic_init(struct platform_device *pdev)
455455

456456
qe_ic_write(qe_ic->regs, QEIC_CICR, 0);
457457

458-
irq_set_handler_data(qe_ic->virq_low, qe_ic);
459-
irq_set_chained_handler(qe_ic->virq_low, low_handler);
458+
irq_set_chained_handler_and_data(qe_ic->virq_low, low_handler, qe_ic);
460459

461-
if (high_handler) {
462-
irq_set_handler_data(qe_ic->virq_high, qe_ic);
463-
irq_set_chained_handler(qe_ic->virq_high, high_handler);
464-
}
460+
if (high_handler)
461+
irq_set_chained_handler_and_data(qe_ic->virq_high,
462+
high_handler, qe_ic);
465463
return 0;
466464
}
467465
static const struct of_device_id qe_ic_ids[] = {

0 commit comments

Comments
 (0)