Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751678Ab2KIJzd (ORCPT ); Fri, 9 Nov 2012 04:55:33 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:33907 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750976Ab2KIJzc (ORCPT ); Fri, 9 Nov 2012 04:55:32 -0500 Date: Fri, 9 Nov 2012 09:55:28 +0000 From: Andy Whitcroft To: Tao Ma Cc: linux-kernel@vger.kernel.org, Andrew Morton Subject: [Acked] [PATCH V2 3/5] checkpatch: Remove reference to feature-removal-schedule.txt. Message-ID: <20121109095528.GP3066@dm> References: <20121108174702.GL3066@dm> <1352425092-2568-1-git-send-email-tm@tao.ma> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1352425092-2568-1-git-send-email-tm@tao.ma> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2537 Lines: 83 On Fri, Nov 09, 2012 at 09:38:12AM +0800, Tao Ma wrote: > From: Tao Ma > > In 9c0ece069, Linus removes feature-removal-schedule.txt from Documentation, > but there is still some reference to this file. So remove them. > > Cc: Andrew Morton > Cc: Andy Whitcroft > Signed-off-by: Tao Ma > --- > scripts/checkpatch.pl | 37 ------------------------------------- > 1 files changed, 0 insertions(+), 37 deletions(-) > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index 21a9f5d..b56c5e0 100755 > --- a/scripts/checkpatch.pl > +++ b/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; > @@ -3181,22 +3160,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/) { > -- > 1.7.0.4 > Looks sane and cirtainly if the file is gone we are gaining nothing with this code. Acked-by: Andy Whitcroft -apw -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/