checkpatch: default to success if only warnings
CHK-level checks have been removed from checkpatch or bumped to
errors, so there is no effect anymore for --strict/--subjective.
Furthermore, even most WARNs have been bumped to errors, with
WARN only reserved to things that patchew probably ought not
to complain about (and that maintainers probably will notice
anyway during review if they are extreme).
Default to exiting with success even if there are WARN-level
failures, and cause --strict to fail for warnings. Maintainers
that want to have a strict 80-character limit for their subsystem
can add it to a commit hook for example.
The --subjective synonym is removed.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 714dbbe..b0096a4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -22,7 +22,7 @@
my $emacs = 0;
my $terse = 0;
my $file = 0;
-my $check = 0;
+my $no_warnings = 0;
my $summary = 1;
my $mailback = 0;
my $summary_file = 0;
@@ -45,7 +45,7 @@
--emacs emacs compile window format
--terse one line per report
-f, --file treat FILE as regular source file
- --subjective, --strict enable more subjective tests
+ --strict fail if only warnings are found
--root=PATH PATH to the kernel tree root
--no-summary suppress the per-file summary
--mailback only produce a report in case of warnings/errors
@@ -71,8 +71,7 @@
'emacs!' => \$emacs,
'terse!' => \$terse,
'f|file!' => \$file,
- 'subjective!' => \$check,
- 'strict!' => \$check,
+ 'strict!' => \$no_warnings,
'root=s' => \$root,
'summary!' => \$summary,
'mailback!' => \$mailback,
@@ -1072,12 +1071,6 @@
our $cnt_warn++;
}
}
-sub CHK {
- if ($check && report("CHECK: $_[0]\n")) {
- our $clean = 0;
- our $cnt_chk++;
- }
-}
sub process {
my $filename = shift;
@@ -2599,7 +2592,6 @@
if ($summary && !($clean == 1 && $quiet == 1)) {
print "$filename " if ($summary_file);
print "total: $cnt_error errors, $cnt_warn warnings, " .
- (($check)? "$cnt_chk checks, " : "") .
"$cnt_lines lines checked\n";
print "\n" if ($quiet == 0);
}
@@ -2622,5 +2614,5 @@
print "CHECKPATCH in MAINTAINERS.\n";
}
- return $clean;
+ return ($no_warnings ? $clean : $cnt_error == 0);
}
