aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Ma2012-12-17 18:01:49 -0600
committerLinus Torvalds2012-12-17 19:15:19 -0600
commit78e3f1f01d23c1a0d5828669d35afa2e7951987d (patch)
tree60221a5006aaec5e0a810facb8a223b910f92175 /scripts
parent1ba8dfd17ead04de18bfca7b68c2a144c8be736a (diff)
downloadkernel-audio-78e3f1f01d23c1a0d5828669d35afa2e7951987d.tar.gz
kernel-audio-78e3f1f01d23c1a0d5828669d35afa2e7951987d.tar.xz
kernel-audio-78e3f1f01d23c1a0d5828669d35afa2e7951987d.zip
checkpatch: remove reference to feature-removal-schedule.txt
In commit 9c0ece069b32 ("Get rid of Documentation/feature-removal.txt"), Linus removes feature-removal-schedule.txt from Documentation, but there is still some reference to this file. So remove them. Signed-off-by: Tao Ma <boyu.mt@taobao.com> Acked-by: Andy Whitcroft <apw@canonical.com> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl37
1 files changed, 0 insertions, 37 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index cd251d5f3f1a..d2d5ba17ad6c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -352,27 +352,6 @@ sub deparenthesize {
352 352
353$chk_signoff = 0 if ($file); 353$chk_signoff = 0 if ($file);
354 354
355my @dep_includes = ();
356my @dep_functions = ();
357my $removal = "Documentation/feature-removal-schedule.txt";
358if ($tree && -f "$root/$removal") {
359 open(my $REMOVE, '<', "$root/$removal") ||
360 die "$P: $removal: open failed - $!\n";
361 while (<$REMOVE>) {
362 if (/^Check:\s+(.*\S)/) {
363 for my $entry (split(/[, ]+/, $1)) {
364 if ($entry =~ m@include/(.*)@) {
365 push(@dep_includes, $1);
366
367 } elsif ($entry !~ m@/@) {
368 push(@dep_functions, $entry);
369 }
370 }
371 }
372 }
373 close($REMOVE);
374}
375
376my @rawlines = (); 355my @rawlines = ();
377my @lines = (); 356my @lines = ();
378my $vname; 357my $vname;
@@ -3205,22 +3184,6 @@ sub process {
3205 } 3184 }
3206 } 3185 }
3207 3186
3208# don't include deprecated include files (uses RAW line)
3209 for my $inc (@dep_includes) {
3210 if ($rawline =~ m@^.\s*\#\s*include\s*\<$inc>@) {
3211 ERROR("DEPRECATED_INCLUDE",
3212 "Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n" . $herecurr);
3213 }
3214 }
3215
3216# don't use deprecated functions
3217 for my $func (@dep_functions) {
3218 if ($line =~ /\b$func\b/) {
3219 ERROR("DEPRECATED_FUNCTION",
3220 "Don't use $func(): see Documentation/feature-removal-schedule.txt\n" . $herecurr);
3221 }
3222 }
3223
3224# no volatiles please 3187# no volatiles please
3225 my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b}; 3188 my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
3226 if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) { 3189 if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {