From d50590de0c646332713aa00a8be0012e089028e8 Mon Sep 17 00:00:00 2001 From: Philipp Hahn Date: Tue, 10 Mar 2026 12:49:05 +0100 Subject: [PATCH] irqchip: Use IS_ERR_OR_NULL() instead of NULL and IS_ERR() checks Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a open coded NULL pointer check. Change generated with coccinelle. To: Marc Zyngier To: Thomas Gleixner To: Andrew Lunn To: Gregory Clement To: Sebastian Hesselbarth Signed-off-by: Philipp Hahn Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260310-b4-is_err_or_null-v1-39-bd63b656022d@avm.de --- drivers/irqchip/irq-gic-v3.c | 2 +- drivers/irqchip/irq-mvebu-odmi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 20f13b686ab22..6dc9827357a21 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -2252,7 +2252,7 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare out_unmap_rdist: for (i = 0; i < nr_redist_regions; i++) - if (rdist_regs[i].redist_base && !IS_ERR(rdist_regs[i].redist_base)) + if (!IS_ERR_OR_NULL(rdist_regs[i].redist_base)) iounmap(rdist_regs[i].redist_base); kfree(rdist_regs); out_unmap_dist: diff --git a/drivers/irqchip/irq-mvebu-odmi.c b/drivers/irqchip/irq-mvebu-odmi.c index b99ab9dcc14b3..94e7eda46e818 100644 --- a/drivers/irqchip/irq-mvebu-odmi.c +++ b/drivers/irqchip/irq-mvebu-odmi.c @@ -217,7 +217,7 @@ err_unmap: for (i = 0; i < odmis_count; i++) { struct odmi_data *odmi = &odmis[i]; - if (odmi->base && !IS_ERR(odmi->base)) + if (!IS_ERR_OR_NULL(odmi->base)) iounmap(odmis[i].base); } bitmap_free(odmis_bm); -- 2.47.3