Commit 342d3d2f authored by Antonio Borneo's avatar Antonio Borneo Committed by Linus Torvalds

checkpatch: fix minor typo and mixed space+tab in indentation

Fix spelling of "concatenation".
Don't use tab after space in indentation.
Signed-off-by: default avatarAntonio Borneo <borneo.antonio@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Joe Perches <joe@perches.com>
Link: http://lkml.kernel.org/r/20200122163852.124417-2-borneo.antonio@gmail.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f36d3eb8
...@@ -4615,7 +4615,7 @@ sub process { ...@@ -4615,7 +4615,7 @@ sub process {
($op eq '>' && ($op eq '>' &&
$ca =~ /<\S+\@\S+$/)) $ca =~ /<\S+\@\S+$/))
{ {
$ok = 1; $ok = 1;
} }
# for asm volatile statements # for asm volatile statements
...@@ -4950,7 +4950,7 @@ sub process { ...@@ -4950,7 +4950,7 @@ sub process {
# conditional. # conditional.
substr($s, 0, length($c), ''); substr($s, 0, length($c), '');
$s =~ s/\n.*//g; $s =~ s/\n.*//g;
$s =~ s/$;//g; # Remove any comments $s =~ s/$;//g; # Remove any comments
if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ && if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&
$c !~ /}\s*while\s*/) $c !~ /}\s*while\s*/)
{ {
...@@ -4989,7 +4989,7 @@ sub process { ...@@ -4989,7 +4989,7 @@ sub process {
# if and else should not have general statements after it # if and else should not have general statements after it
if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/) { if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/) {
my $s = $1; my $s = $1;
$s =~ s/$;//g; # Remove any comments $s =~ s/$;//g; # Remove any comments
if ($s !~ /^\s*(?:\sif|(?:{|)\s*\\?\s*$)/) { if ($s !~ /^\s*(?:\sif|(?:{|)\s*\\?\s*$)/) {
ERROR("TRAILING_STATEMENTS", ERROR("TRAILING_STATEMENTS",
"trailing statements should be on next line\n" . $herecurr); "trailing statements should be on next line\n" . $herecurr);
...@@ -5165,7 +5165,7 @@ sub process { ...@@ -5165,7 +5165,7 @@ sub process {
{ {
} }
# Flatten any obvious string concatentation. # Flatten any obvious string concatenation.
while ($dstat =~ s/($String)\s*$Ident/$1/ || while ($dstat =~ s/($String)\s*$Ident/$1/ ||
$dstat =~ s/$Ident\s*($String)/$1/) $dstat =~ s/$Ident\s*($String)/$1/)
{ {
......
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