[tip: irq/drivers] irqchip: Use IS_ERR_OR_NULL() instead of NULL and IS_ERR() checks

[tip-bot2 for Philipp Hahn]

The following commit has been merged into the irq/drivers branch of tip:

Commit-ID:     d50590de0c646332713aa00a8be0012e089028e8
Gitweb:        https://git.kernel.org/tip/d50590de0c646332713aa00a8be0012e089028e8
Author:        Philipp Hahn <phahn-oss@xxxxxx>
AuthorDate:    Tue, 10 Mar 2026 12:49:05 +01:00
Committer:     Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Tue, 10 Mar 2026 18:34:52 +01:00

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 <maz@xxxxxxxxxx>
To: Thomas Gleixner <tglx@xxxxxxxxxx>
To: Andrew Lunn <andrew@xxxxxxx>
To: Gregory Clement <gregory.clement@xxxxxxxxxxx>
To: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>

Signed-off-by: Philipp Hahn <phahn-oss@xxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Link: https://patch.msgid.link/20260310-b4-is_err_or_null-v1-39-bd63b656022d@xxxxxx
---
 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 20f13b6..6dc9827 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 b99ab9d..94e7eda 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);