[Linux-kernel-mentees] [PATCH] checkpatch: fix spacing check for return with parentheses

Dwaipayan Ray dwaipayanray1 at gmail.com
Tue Nov 17 18:12:36 UTC 2020


The spacing check is unreachable for return statements
followed by an opening parentheses.
For example:

int foo(int bar, int baz)
{
	return(bar+baz);
}

There should be an error emitted for a space between
return and the opening parentheses but checkpatch doesn't
emit one.

Fix the spacing check. Also add --fix option to
the check.

Signed-off-by: Dwaipayan Ray <dwaipayanray1 at gmail.com>
---
 scripts/checkpatch.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 8da6cde20c68..07feeb3321e2 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -5176,10 +5176,13 @@ sub process {
 				if ($value =~ m/^\s*$FuncArg\s*(?:\?|$)/) {
 					ERROR("RETURN_PARENTHESES",
 					      "return is not a function, parentheses are not required\n" . $herecurr);
+				} elsif ($spacing !~ /\s+/) {
+					if (ERROR("SPACING",
+						  "space required before the open parenthesis '('\n" . $herecurr) &&
+					    $fix) {
+						$fixed[$fixlinenr] =~ s/\breturn\s*\(/return \(/;
+					}
 				}
-			} elsif ($spacing !~ /\s+/) {
-				ERROR("SPACING",
-				      "space required before the open parenthesis '('\n" . $herecurr);
 			}
 		}
 
-- 
2.27.0



More information about the Linux-kernel-mentees mailing list