The following commit has been merged into the irq/core branch of tip: Commit-ID: 4609c6eab67bb1785a5337ddafb5c74c796bcd35 Gitweb: https://git.kernel.org/tip/4609c6eab67bb1785a5337ddafb5c74c796bcd35 Author: Hongbo Li <lihongbo22@xxxxxxxxxx> AuthorDate: Wed, 28 Aug 2024 20:27:24 +08:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Thu, 29 Aug 2024 16:42:07 +02:00 irqdomain: Use IS_ERR_OR_NULL() in irq_domain_trim_hierarchy() Use IS_ERR_OR_NULL() instead of open-coding a NULL and a error pointer check. Signed-off-by: Hongbo Li <lihongbo22@xxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/all/20240828122724.3697447-1-lihongbo22@xxxxxxxxxx --- kernel/irq/irqdomain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 5df8780..e0bff21 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -1403,7 +1403,7 @@ static int irq_domain_trim_hierarchy(unsigned int virq) tail = NULL; /* The first entry must have a valid irqchip */ - if (!irq_data->chip || IS_ERR(irq_data->chip)) + if (IS_ERR_OR_NULL(irq_data->chip)) return -EINVAL; /*
|