[Linux-kernel-mentees] [PATCH] checkpatch: add fix option for LOGICAL_CONTINUATIONS

Lukas Bulwahn lukas.bulwahn at gmail.com
Tue Nov 17 10:53:20 UTC 2020


On Tue, Nov 17, 2020 at 11:43 AM Aditya Srivastava <yashsri421 at gmail.com> wrote:
>
> Currently, checkpatch warns if logical continuations are placed at the
> start of a line and not at the end of previous line.
>
> E.g., running checkpatch on commit 3485507fc272 ("staging:
> bcm2835-camera: Reduce length of enum names") reports:
>
> CHECK: Logical continuations should be on the previous line
> +       if (!ret
> +           && camera_port ==
>
> Provide a simple fix by adding logical operator at the end of previous
> line and removing from current line, if both the lines are additions
> (ie start with '+')
>

That change makes sense. I wonder, though. if we are now just starting
to reimplement clang-format (just worse...).

E.g., what happens when you run clang-format on that file; would it do
the same correction to those lines?

Lukas

> Signed-off-by: Aditya Srivastava <yashsri421 at gmail.com>
> ---
>  scripts/checkpatch.pl | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 5b1a5a65e69a..f61ac7456151 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -3553,8 +3553,14 @@ sub process {
>
>  # check for && or || at the start of a line
>                 if ($rawline =~ /^\+\s*(&&|\|\|)/) {
> -                       CHK("LOGICAL_CONTINUATIONS",
> -                           "Logical continuations should be on the previous line\n" . $hereprev);
> +                       my $operator = $1;
> +                       if (CHK("LOGICAL_CONTINUATIONS",
> +                               "Logical continuations should be on the previous line\n" . $hereprev) &&
> +                           $fix && $prevrawline =~ /^\+/) {
> +                               # add logical operator to the previous line, remove from current line
> +                               $fixed[$fixlinenr - 1] .= " $operator";
> +                               $fixed[$fixlinenr] =~ s/$operator\s*//;
> +                       }
>                 }
>
>  # check indentation starts on a tab stop
> --
> 2.17.1
>


More information about the Linux-kernel-mentees mailing list