[PATCH RESEND] checkpatch: don't flag ACQUIRE_ERR() assignments in if conditions
From: Guixin Liu
Date: Tue Sep 15 2026 - 22:09:55 EST
ACQUIRE_ERR() and its wrappers, PM_RUNTIME_ACQUIRE_ERR() and
IIO_DEV_ACQUIRE_FAILED(), report whether a conditional cleanup.h guard
was acquired, and drivers consume the result directly in an if
condition:
if ((rc = ACQUIRE_ERR(mutex_intr, &lock)))
return rc;
That combined form is the established style at the 49 in-tree call
sites under drivers/cxl and drivers/pci/tsm.c, so ASSIGN_IN_IF fires
there only as a false positive, and every patch touching those lines
carries noise that reviewers have to wave off manually.
Skip the check when the assigned expression is a call to a macro from
that family, matched by the *_ACQUIRE_ERR() / *_ACQUIRE_FAILED() naming
convention of its wrappers. Plain assignments and near-miss identifiers
still get flagged.
Signed-off-by: Guixin Liu <kanie@xxxxxxxxxxxxxxxxx>
---
Discussion leading to this patch, where the false positive showed up on
a cxl patch and covering the wrapper macros was requested as well:
https://lore.kernel.org/linux-cxl/20260910094017.4032170-3-kanie@xxxxxxxxxxxxxxxxx/
scripts/checkpatch.pl | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 8a7787d228a6..fbc500bcfaa1 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -5777,7 +5777,12 @@ sub process {
my ($s, $c) = ($stat, $cond);
my $fixed_assign_in_if = 0;
- if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/s) {
+ # ACQUIRE_ERR() and its wrappers, e.g. PM_RUNTIME_ACQUIRE_ERR()
+ # and IIO_DEV_ACQUIRE_FAILED(), are intended to be evaluated in
+ # an if condition, with the error assigned in the condition:
+ # if ((rc = ACQUIRE_ERR(name, &lock)))
+ if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/s &&
+ $c !~ /=\s*\w*ACQUIRE_(?:ERR|FAILED)\s*\(/) {
if (ERROR("ASSIGN_IN_IF",
"do not use assignment in if condition\n" . $herecurr) &&
$fix && $perl_version_ok) {
base-commit: 50d05c7c76c96b90462f24debacca971d2e86713
--
2.43.7