From: Chen Ni Date: Thu, 15 May 2025 08:39:19 +0000 (+0800) Subject: soc: fsl: qe: Consolidate chained IRQ handler install/remove X-Git-Tag: v6.16-rc1~100^2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=695d702f42bf4bd335e30f542ca710af081ee2a3;p=thirdparty%2Flinux.git 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 Link: https://lore.kernel.org/r/20250515083919.3811473-1-nichen@iscas.ac.cn Signed-off-by: Christophe Leroy --- diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c index 77bf0e83ffccc..bd74942c73741 100644 --- a/drivers/soc/fsl/qe/qe_ic.c +++ b/drivers/soc/fsl/qe/qe_ic.c @@ -455,13 +455,11 @@ static int qe_ic_init(struct platform_device *pdev) qe_ic_write(qe_ic->regs, QEIC_CICR, 0); - irq_set_handler_data(qe_ic->virq_low, qe_ic); - irq_set_chained_handler(qe_ic->virq_low, low_handler); + irq_set_chained_handler_and_data(qe_ic->virq_low, low_handler, qe_ic); - if (high_handler) { - irq_set_handler_data(qe_ic->virq_high, qe_ic); - irq_set_chained_handler(qe_ic->virq_high, high_handler); - } + if (high_handler) + irq_set_chained_handler_and_data(qe_ic->virq_high, + high_handler, qe_ic); return 0; } static const struct of_device_id qe_ic_ids[] = {