[PATCH 36/61] arch/sh: Prefer IS_ERR_OR_NULL over manual NULL check
From: Philipp Hahn
Date: Tue Mar 10 2026 - 08:45:49 EST
Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL
check.
Change generated with coccinelle.
To: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
To: Rich Felker <dalias@xxxxxxxx>
To: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Cc: linux-sh@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Philipp Hahn <phahn-oss@xxxxxx>
---
arch/sh/mm/ioremap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c
index 5bbde53fb32d785607f8281f9e9cee16d16fc551..06c3bfe2511fd0d5e67e28a8882aa9159991c30a 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c
@@ -97,7 +97,7 @@ void __iomem __ref *ioremap_prot(phys_addr_t phys_addr, size_t size,
*/
mapped = pmb_remap_caller(phys_addr, size, pgprot,
__builtin_return_address(0));
- if (mapped && !IS_ERR(mapped))
+ if (!IS_ERR_OR_NULL(mapped))
return mapped;
return generic_ioremap_prot(phys_addr, size, pgprot);
--
2.43.0