From e4e79c6d2c2cc37dc6827e5405782bd9eb8d6e06 Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Mon, 17 Dec 2012 16:01:49 -0800 Subject: [PATCH] --- yaml --- r: 346416 b: refs/heads/master c: 78e3f1f01d23c1a0d5828669d35afa2e7951987d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/checkpatch.pl | 37 ------------------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/[refs] b/[refs] index 40387c9d84ec..45e1cb629399 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ba8dfd17ead04de18bfca7b68c2a144c8be736a +refs/heads/master: 78e3f1f01d23c1a0d5828669d35afa2e7951987d diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index cd251d5f3f1a..d2d5ba17ad6c 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -352,27 +352,6 @@ sub deparenthesize { $chk_signoff = 0 if ($file); -my @dep_includes = (); -my @dep_functions = (); -my $removal = "Documentation/feature-removal-schedule.txt"; -if ($tree && -f "$root/$removal") { - open(my $REMOVE, '<', "$root/$removal") || - die "$P: $removal: open failed - $!\n"; - while (<$REMOVE>) { - if (/^Check:\s+(.*\S)/) { - for my $entry (split(/[, ]+/, $1)) { - if ($entry =~ m@include/(.*)@) { - push(@dep_includes, $1); - - } elsif ($entry !~ m@/@) { - push(@dep_functions, $entry); - } - } - } - } - close($REMOVE); -} - my @rawlines = (); my @lines = (); my $vname; @@ -3205,22 +3184,6 @@ sub process { } } -# don't include deprecated include files (uses RAW line) - for my $inc (@dep_includes) { - if ($rawline =~ m@^.\s*\#\s*include\s*\<$inc>@) { - ERROR("DEPRECATED_INCLUDE", - "Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n" . $herecurr); - } - } - -# don't use deprecated functions - for my $func (@dep_functions) { - if ($line =~ /\b$func\b/) { - ERROR("DEPRECATED_FUNCTION", - "Don't use $func(): see Documentation/feature-removal-schedule.txt\n" . $herecurr); - } - } - # no volatiles please my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b}; if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {