Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle.
To: Marc Zyngier <[email protected]> To: Thomas Gleixner <[email protected]> To: Andrew Lunn <[email protected]> To: Gregory Clement <[email protected]> To: Sebastian Hesselbarth <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Philipp Hahn <[email protected]> --- 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 20f13b686ab22faf722dd2b24faf96af636a4bbd..6dc9827357a21ae05dd838fb717871c73f3c7562 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 b99ab9dcc14b3ba982876cf5525499d02bc1c997..94e7eda46e81833cfe0479b6fabba715bf4ef6b8 100644 --- a/drivers/irqchip/irq-mvebu-odmi.c +++ b/drivers/irqchip/irq-mvebu-odmi.c @@ -217,7 +217,7 @@ static int __init mvebu_odmi_init(struct device_node *node, 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.43.0
