Commit 3fef12d6 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds

checkpatch: allow for comments either side of a brace on case

When specifying case we may have comments and/or braces at the end without
actually having a 'statement'.  Allow for these to occur in any order.
Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 740504c6
...@@ -2043,7 +2043,7 @@ sub process { ...@@ -2043,7 +2043,7 @@ sub process {
# case and default should not have general statements after them # case and default should not have general statements after them
if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g && if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
$line !~ /\G(?: $line !~ /\G(?:
(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$| (?:\s*$;*)(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
\s*return\s+ \s*return\s+
)/xg) )/xg)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment