Re: [PATCH 50/61] iommu: Prefer IS_ERR_OR_NULL over manual NULL check
From: Robin Murphy
Date: Mon Mar 16 2026 - 09:36:12 EST
On 2026-03-10 11:49 am, Philipp Hahn wrote:
Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL
check.
AFAICS it doesn't look possible for the argument to be anything other than valid at both callsites, so *both* conditions here seem in fact to be entirely redundant.
Change generated with coccinelle.
Please use coccinelle responsibly. Mechanical changes are great for scripted API updates, but for cleanup, whilst it's ideal for *finding* areas of code that are worth looking at, the code then wants actually looking at, in its whole context, because meaningful cleanup often goes deeper than trivial replacement.
In particular, anywhere IS_ERR_OR_NULL() is genuinely relevant is usually a sign of bad interface design, so if you're looking at this then you really should be looking first and foremost to remove any checks that are already unnecessary, and for the remainder, to see if the thing being checked can be improved to not mix the two different styles. That would be constructive and (usually) welcome cleanup. Simply churning a bunch of code with this ugly macro that's arguably less readable than what it replaces, not so much.
Thanks,
Robin.
To: Joerg Roedel <joro@xxxxxxxxxx>
To: Will Deacon <will@xxxxxxxxxx>
To: Robin Murphy <robin.murphy@xxxxxxx>
Cc: iommu@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Philipp Hahn <phahn-oss@xxxxxx>
---
drivers/iommu/omap-iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 8231d7d6bb6a9202025643639a6b28e6faa84659..500a42b57a997696ff37c76f028a717ab71d01f9 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -881,7 +881,7 @@ static int omap_iommu_attach(struct omap_iommu *obj, u32 *iopgd)
**/
static void omap_iommu_detach(struct omap_iommu *obj)
{
- if (!obj || IS_ERR(obj))
+ if (IS_ERR_OR_NULL(obj))
return;
spin_lock(&obj->iommu_lock);