Re: [PATCH V2] checkpatch: fix minor typo and mixed space+tab in indentation

Joe Perches
2020-01-22T17:28:03Z

On Wed, 2020-01-22 at 17:38 +0100, Antonio Borneo wrote:
> Fix spelling of "concatenation".
> Don't use tab after space in indentation.
>
> Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>

I've no objection to any of these 3 patches.
Andrew, might you pick them up please?

https://lore.kernel.org/patchwork/patch/1183806/
https://lore.kernel.org/patchwork/patch/1183805/
https://lore.kernel.org/patchwork/patch/1183804/

> ---
>
> v1 -> v2
> rebased
>
> ---
> scripts/checkpatch.pl | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 30da08d9646a..4c1be774b0ed 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -4582,7 +4582,7 @@ sub process {
> ($op eq '>' &&
> $ca =~ /<\S+\@\S+$/))
> {
> - $ok = 1;
> + $ok = 1;
> }
>
> # for asm volatile statements
> @@ -4917,7 +4917,7 @@ sub process {
> # conditional.
> substr($s, 0, length($c), '');
> $s =~ s/\n.*//g;
> - $s =~ s/$;//g; # Remove any comments
> + $s =~ s/$;//g; # Remove any comments
> if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&
> $c !~ /}\s*while\s*/)
> {
> @@ -4956,7 +4956,7 @@ sub process {
> # if and else should not have general statements after it
> if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/) {
> my $s = $1;
> - $s =~ s/$;//g; # Remove any comments
> + $s =~ s/$;//g; # Remove any comments
> if ($s !~ /^\s*(?:\sif|(?:{|)\s*\\?\s*$)/) {
> ERROR("TRAILING_STATEMENTS",
> "trailing statements should be on next line\n" . $herecurr);
> @@ -5132,7 +5132,7 @@ sub process {
> {
> }
>
> - # Flatten any obvious string concatentation.
> + # Flatten any obvious string concatenation.
> while ($dstat =~ s/($String)\s*$Ident/$1/ ||
> $dstat =~ s/$Ident\s*($String)/$1/)
> {