drm/i915/fdinfo: Don't show engine classes not present

[platform/kernel/linux-starfive.git] / scripts / checkpatch.pl

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b01c36a..577e029 100755 (executable)
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -334,7 +334,7 @@ if ($user_codespellfile) {
 } elsif (!(-f $codespellfile)) {
        # If /usr/share/codespell/dictionary.txt is not present, try to find it
        # under codespell's install directory: <codespell_root>/data/dictionary.txt
-       if (($codespell || $help) && which("codespell") ne "" && which("python") ne "") {
+       if (($codespell || $help) && which("python3") ne "") {
                my $python_codespell_dict = << "EOF";
 
 import os.path as op
@@ -344,7 +344,7 @@ codespell_file = op.join(codespell_dir, 'data', 'dictionary.txt')
 print(codespell_file, end='')
 EOF
 
-               my $codespell_dict = `python -c "$python_codespell_dict" 2> /dev/null`;
+               my $codespell_dict = `python3 -c "$python_codespell_dict" 2> /dev/null`;
                $codespellfile = $codespell_dict if (-f $codespell_dict);
        }
 }
@@ -3926,7 +3926,7 @@ sub process {
                if ($prevline =~ /^[\+ ]};?\s*$/ &&
                    $line =~ /^\+/ &&
                    !($line =~ /^\+\s*$/ ||
-                     $line =~ /^\+\s*EXPORT_SYMBOL/ ||
+                     $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param)/ ||
                      $line =~ /^\+\s*MODULE_/i ||
                      $line =~ /^\+\s*\#\s*(?:end|elif|else)/ ||
                      $line =~ /^\+[a-z_]*init/ ||
@@ -5551,6 +5551,7 @@ sub process {
                    defined($stat) && defined($cond) &&
                    $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
                        my ($s, $c) = ($stat, $cond);
+                       my $fixed_assign_in_if = 0;
 
                        if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/s) {
                                if (ERROR("ASSIGN_IN_IF",
@@ -5575,6 +5576,7 @@ sub process {
                                                $newline .= ')';
                                                $newline .= " {" if (defined($brace));
                                                fix_insert_line($fixlinenr + 1, $newline);
+                                               $fixed_assign_in_if = 1;
                                        }
                                }
                        }
@@ -5598,8 +5600,20 @@ sub process {
                                        $stat_real = "[...]\n$stat_real";
                                }
 
-                               ERROR("TRAILING_STATEMENTS",
-                                     "trailing statements should be on next line\n" . $herecurr . $stat_real);
+                               if (ERROR("TRAILING_STATEMENTS",
+                                         "trailing statements should be on next line\n" . $herecurr . $stat_real) &&
+                                   !$fixed_assign_in_if &&
+                                   $cond_lines == 0 &&
+                                   $fix && $perl_version_ok &&
+                                   $fixed[$fixlinenr] =~ /^\+(\s*)((?:if|while|for)\s*$balanced_parens)\s*(.*)$/) {
+                                       my $indent = $1;
+                                       my $test = $2;
+                                       my $rest = rtrim($4);
+                                       if ($rest =~ /;$/) {
+                                               $fixed[$fixlinenr] = "\+$indent$test";
+                                               fix_insert_line($fixlinenr + 1, "$indent\t$rest");
+                                       }
+                               }
                        }
                }
 
@@ -7418,6 +7432,13 @@ sub process {
                                WARN("MODULE_LICENSE",
                                     "unknown module license " . $extracted_string . "\n" . $herecurr);
                        }
+                       if (!$file && $extracted_string eq '"GPL v2"') {
+                               if (WARN("MODULE_LICENSE",
+                                    "Prefer \"GPL\" over \"GPL v2\" - see commit bf7fbeeae6db (\"module: Cure the MODULE_LICENSE \"GPL\" vs. \"GPL v2\" bogosity\")\n" . $herecurr) &&
+                                   $fix) {
+                                       $fixed[$fixlinenr] =~ s/\bMODULE_LICENSE\s*\(\s*"GPL v2"\s*\)/MODULE_LICENSE("GPL")/;
+                               }
+                       }
                }
 
 # check for sysctl duplicate constants