aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/checkpatch.pl
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2010-10-26 17:23:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 19:52:19 -0400
commitd2c0a23514d8ac4ed10a8e742467cfb72ca3bed8 (patch)
treea3c0283ee6cdcaa92ecf9ae2ec7a4f1e627c359c /scripts/checkpatch.pl
parente91b6e263ed6735c766cb14bbe63b9c7bd774526 (diff)
checkpatch: suggest cleanpatch and cleanfile when appropriate
When we hit types of whitespace which may be fixed by scripts/cleanpatch and scripts/cleanfile suggest their use in our report. Suggested-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts/checkpatch.pl')
-rwxr-xr-xscripts/checkpatch.pl13
1 files changed, 13 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 41f59b1e209b..32d6a236570d 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -103,6 +103,8 @@ for my $key (keys %debug) {
103 die "$@" if ($@); 103 die "$@" if ($@);
104} 104}
105 105
106my $rpt_cleaners = 0;
107
106if ($terse) { 108if ($terse) {
107 $emacs = 1; 109 $emacs = 1;
108 $quiet++; 110 $quiet++;
@@ -1389,6 +1391,7 @@ sub process {
1389 } elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) { 1391 } elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) {
1390 my $herevet = "$here\n" . cat_vet($rawline) . "\n"; 1392 my $herevet = "$here\n" . cat_vet($rawline) . "\n";
1391 ERROR("trailing whitespace\n" . $herevet); 1393 ERROR("trailing whitespace\n" . $herevet);
1394 $rpt_cleaners = 1;
1392 } 1395 }
1393 1396
1394# check for Kconfig help text having a real description 1397# check for Kconfig help text having a real description
@@ -1450,6 +1453,7 @@ sub process {
1450 $rawline =~ /^\+\s* \s*/) { 1453 $rawline =~ /^\+\s* \s*/) {
1451 my $herevet = "$here\n" . cat_vet($rawline) . "\n"; 1454 my $herevet = "$here\n" . cat_vet($rawline) . "\n";
1452 ERROR("code indent should use tabs where possible\n" . $herevet); 1455 ERROR("code indent should use tabs where possible\n" . $herevet);
1456 $rpt_cleaners = 1;
1453 } 1457 }
1454 1458
1455# check for space before tabs. 1459# check for space before tabs.
@@ -2842,6 +2846,15 @@ sub process {
2842 print "\n" if ($quiet == 0); 2846 print "\n" if ($quiet == 0);
2843 } 2847 }
2844 2848
2849 if ($quiet == 0) {
2850 # If there were whitespace errors which cleanpatch can fix
2851 # then suggest that.
2852 if ($rpt_cleaners) {
2853 print "NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n";
2854 print " scripts/cleanfile\n\n";
2855 }
2856 }
2857
2845 if ($clean == 1 && $quiet == 0) { 2858 if ($clean == 1 && $quiet == 0) {
2846 print "$vname has no obvious style problems and is ready for submission.\n" 2859 print "$vname has no obvious style problems and is ready for submission.\n"
2847 } 2860 }