The patch titled checkpatch: allow parentheses on return for comparisons has been added to the -mm tree. Its filename is checkpatch-allow-parentheses-on-return-for-comparisons.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: checkpatch: allow parentheses on return for comparisons From: Andy Whitcroft <apw@xxxxxxxxxxxxx> It seems to be a common idiom to include braces on conditionals in all contexts including return. Allow this exception to the return is not a function checks. Reported by Kay Sievers. Cc: Kay Sievers <kay.sievers@xxxxxxxx> Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN scripts/checkpatch.pl~checkpatch-allow-parentheses-on-return-for-comparisons scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-allow-parentheses-on-return-for-comparisons +++ a/scripts/checkpatch.pl @@ -127,6 +127,7 @@ our $Lval = qr{$Ident(?:$Member)*}; our $Constant = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*}; our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)}; +our $Compare = qr{<=|>=|==|!=|<|>}; our $Operators = qr{ <=|>=|==|!=| =>|->|<<|>>|<|>|!|~| @@ -1983,9 +1984,9 @@ sub process { my $spacing = $1; my $value = $2; - # Flatten any parentheses and braces + # Flatten any parentheses $value =~ s/\)\(/\) \(/g; - while ($value =~ s/\([^\(\)]*\)/1/) { + while ($value !~ /(?:$Ident|-?$Constant)\s*$Compare\s*(?:$Ident|-?$Constant)/ && $value =~ s/\([^\(\)]*\)/1/) { } if ($value =~ /^(?:$Ident|-?$Constant)$/) { _ Patches currently in -mm which might be from apw@xxxxxxxxxxxxx are linux-next.patch checkpatch-update-copyrights.patch checkpatch-add-warning-for-p0-patches.patch checkpatch-allow-parentheses-on-return-for-comparisons.patch checkpatch-try-to-catch-missing-vmlinux_symbol-in-vmlinuxldsh.patch checkpatch-loosen-spacing-on-typedef-function-checks.patch checkpatch-fix-continuation-detection-when-handling-spacing-on-operators.patch checkpatch-track-ifdef-else-endif-when-tracking-blocks.patch checkpatch-do-not-report-nr_static-as-a-static-declaration.patch checkpatch-ensure-we-actually-detect-if-assignments-split-across-lines.patch checkpatch-struct-file_operations-should-normally-be-const.patch checkpatch-fix-the-perlcritic-errors.patch checkpatch-version-026.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html