Remove all the reference to feature-removal-schedule.

PATCH Superseded Tao Ma 2 participants 9 messages Nov 8, 2012 – Nov 9, 2012

Subsystems (5)

Documentation Sound MMC, SD and SDIO Networking drivers (wireless) +1 more subsystems

lore

Share & tools

lore

Tao Ma

author

2012-11-08 13:48 UTC #0 lore raw

cover Remove all the reference to feature-removal-schedule.

In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation, but there are still some reference to this file. So remove all of them.

Thanks
Tao

Tao Ma

author

2012-11-08 13:52 UTC #1 lore raw

PATCH 1/5 Documentation: Remove reference to feature-removal-schedule.txt.

From: Tao Ma <[email protected]>

In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation, but there is still some reference to this file. So remove them.

Cc Andrew Morton <[email protected]>

Cc Rob Landley <[email protected]>

Cc Linus Torvalds <[email protected]>

Signed-off-by Tao Ma <[email protected]>

---
 Documentation/00-INDEX   |    2 --
 Documentation/ABI/README |    3 ---
 2 files changed, 0 insertions(+), 5 deletions(-)

Documentation/00-INDEX +0 -2

index ceb1ff7..8afe64f 100644
@@ -136,8 +136,6 @@ fault-injection/
 	- dir with docs about the fault injection capabilities infrastructure.
 fb/
 	- directory with info on the frame buffer graphics abstraction layer.
-feature-removal-schedule.txt
-	- list of files and features that are going to be removed.
 filesystems/
 	- info on the vfs and the various filesystems that Linux supports.
 firmware_class/

Documentation/ABI/README +0 -3

index 9feaf16..1006982 100644
@@ -36,9 +36,6 @@ The different levels of stability are:
 	the kernel, but are marked to be removed at some later point in
 	time.  The description of the interface will document the reason
 	why it is obsolete and when it can be expected to be removed.
-	The file Documentation/feature-removal-schedule.txt may describe
-	some of these interfaces, giving a schedule for when they will
-	be removed.
 
   removed/
 	This directory contains a list of the old interfaces that have

Signature · 1 line

1.7.0.4

Tao Ma

author

2012-11-08 13:52 UTC #2 lore raw

PATCH 2/5 kernel: Remove reference to feature-removal-schedule.txt.

From: Tao Ma <[email protected]>

In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation, but there is still some reference to this file. So remove them.

Cc Andrew Morton <[email protected]>

Cc Linus Torvalds <[email protected]>

Signed-off-by Tao Ma <[email protected]>

---
 kernel/cgroup.c |    1 -
 kernel/module.c |    3 ---
 2 files changed, 0 insertions(+), 4 deletions(-)

kernel/cgroup.c +0 -1

index f24f724..46cfd4c 100644
@@ -1381,7 +1381,6 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
 	if (ret)
 		goto out_unlock;
 
-	/* See feature-removal-schedule.txt */
 	if (opts.subsys_mask != root->actual_subsys_mask || opts.release_agent)
 		pr_warning("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n",
 			   task_tgid_nr(current), current->comm);

kernel/module.c +0 -3

index 6085f5e..b4e3f0c 100644
@@ -372,9 +372,6 @@ static bool check_symbol(const struct symsearch *syms,
 			printk(KERN_WARNING "Symbol %s is being used "
 			       "by a non-GPL module, which will not "
 			       "be allowed in the future\n", fsa->name);
-			printk(KERN_WARNING "Please see the file "
-			       "Documentation/feature-removal-schedule.txt "
-			       "in the kernel source tree for more details.\n");
 		}
 	}

Signature · 1 line

1.7.0.4

Tao Ma

author

2012-11-08 13:53 UTC #3 lore raw

PATCH 3/5 checkpatch: Remove reference to feature-removal-schedule.txt.

In reply to Tao Ma

From: Tao Ma <[email protected]>

In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation, but there is still some reference to this file. So remove them.

Cc Andrew Morton <[email protected]>

Cc Andy Whitcroft <[email protected]>

Cc Linus Torvalds <[email protected]>

Signed-off-by Tao Ma <[email protected]>

---
 scripts/checkpatch.pl |   44 --------------------------------------------
 1 files changed, 0 insertions(+), 44 deletions(-)

scripts/checkpatch.pl +0 ~~-44~~

index 21a9f5d..b0240b8 100755
@@ -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,29 +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/) {
-			WARN("VOLATILE",
-			     "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
-		}
-
 # warn about #if 0
 		if ($line =~ /^.\s*\#\s*if\s+0\b/) {
 			CHK("REDUNDANT_CODE",

Signature · 1 line

1.7.0.4

Andy Whitcroft

maintainer

2012-11-08 17:47 UTC #4 lore raw

Re: [PATCH 3/5] checkpatch: Remove reference to feature-removal-schedule.txt.

Quoted 62 lines · Tao Ma

From: Tao Ma <[email protected]>

In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation, but there is still some reference to this file. So remove them.

Cc Andrew Morton <[email protected]>

Cc Andy Whitcroft <[email protected]>

Cc Linus Torvalds <[email protected]>

Signed-off-by Tao Ma <[email protected]>

---
 scripts/checkpatch.pl |   44 --------------------------------------------
 1 files changed, 0 insertions(+), 44 deletions(-)

scripts/checkpatch.pl +0 ~~-34~~

index 21a9f5d..b0240b8 100755
@@ -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,29 +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);

scripts/checkpatch.pl sub process { · line 3206

Quoted 10 lines

scripts/checkpatch.pl +0 ~~-10~~

-			}
-		}
-
-# no volatiles please
-		my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
-		if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
-			WARN("VOLATILE",
-			     "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
-		}
-

This last bit here looks to be an accidental extra deletiong ? I don't think this relates to the patch at hand.

scripts/checkpatch.pl sub process { · line 3165

Quoted 3 lines

scripts/checkpatch.pl +0 -0

 # warn about #if 0
 		if ($line =~ /^.\s*\#\s*if\s+0\b/) {
 			CHK("REDUNDANT_CODE",

-apw

Tao Ma

author

2012-11-09 01:38 UTC #5 lore raw

PATCH v2 3/5 checkpatch: Remove reference to feature-removal-schedule.txt.

From: Tao Ma <[email protected]>

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 <[email protected]>

Cc Andy Whitcroft <[email protected]>

Signed-off-by Tao Ma <[email protected]>

---
 scripts/checkpatch.pl |   37 -------------------------------------
 1 files changed, 0 insertions(+), 37 deletions(-)

scripts/checkpatch.pl +0 ~~-37~~

index 21a9f5d..b56c5e0 100755
@@ -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/) {

Signature · 1 line

1.7.0.4

Andy Whitcroft

maintainer

2012-11-09 09:55 UTC #6 lore raw

PATCH v2 3/5 checkpatch: Remove reference to feature-removal-schedule.txt.

Quoted 70 lines · Tao Ma

From: Tao Ma <[email protected]>

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 <[email protected]>

Cc Andy Whitcroft <[email protected]>

Signed-off-by Tao Ma <[email protected]>

---
 scripts/checkpatch.pl |   37 -------------------------------------
 1 files changed, 0 insertions(+), 37 deletions(-)

scripts/checkpatch.pl +0 ~~-37~~

index 21a9f5d..b56c5e0 100755
@@ -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/) {

Signature · 1 line

1.7.0.4

Looks sane and cirtainly if the file is gone we are gaining nothing with this code.

Acked-by Andy Whitcroft <[email protected]>

-apw

Tao Ma

author

2012-11-08 13:53 UTC #7 lore raw

PATCH 4/5 sound: Remove reference to feature-removal-schedule.txt.

In reply to Tao Ma

From: Tao Ma <[email protected]>

In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation, but there is still some reference to this file. So remove them.

Cc Andrew Morton <[email protected]>

Cc Takashi Iwai <[email protected]>

Cc Linus Torvalds <[email protected]>

Signed-off-by Tao Ma <[email protected]>

---
 sound/Kconfig      |    3 ---
 sound/sound_core.c |    3 +--
 2 files changed, 1 insertions(+), 5 deletions(-)

sound/Kconfig +0 -3

index 261a03c..c710ce2 100644
@@ -52,9 +52,6 @@ config SOUND_OSS_CORE_PRECLAIM
 
 	  Disabling this allows alternative OSS implementations.
 
-	  Please read Documentation/feature-removal-schedule.txt for
-	  details.
-
 	  If unsure, say Y.
 
 source "sound/oss/dmasound/Kconfig"

sound/sound_core.c +1 -2

index fb9255c..bb23009 100644
@@ -146,8 +146,7 @@ extern int msnd_pinnacle_init(void);
  * devices only the standard chrdev aliases are requested.
  *
  * All these clutters are scheduled to be removed along with
- * sound-slot/service-* module aliases.  Please take a look at
- * feature-removal-schedule.txt for details.
+ * sound-slot/service-* module aliases.
  */
 #ifdef CONFIG_SOUND_OSS_CORE_PRECLAIM
 static int preclaim_oss = 1;

Signature · 1 line

1.7.0.4

Tao Ma

author

2012-11-08 13:53 UTC #8 lore raw

PATCH 5/5 drivers: Remove reference to feature-removal-schedule.txt.

In reply to Tao Ma

From: Tao Ma <[email protected]>

In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation, but there is still some reference to this file. So remove them.

Cc Greg Kroah-Hartman <[email protected]>

Cc Andrew Morton <[email protected]>

Cc Linus Torvalds <[email protected]>

Signed-off-by Tao Ma <[email protected]>

---
 drivers/mmc/host/Kconfig     |    4 +---
 drivers/net/wireless/Kconfig |    6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

drivers/mmc/host/Kconfig +1 -3

index 9bf10e7..82fc4c8 100644
@@ -282,9 +282,7 @@ config MMC_AT91
 	depends on ARCH_AT91
 	help
 	  This selects the AT91 MCI controller. This driver will
-	  be removed soon (for more information have a look to
-	  Documentation/feature-removal-schedule.txt). Please use
-	  MMC_ATMEL_MCI.
+	  be removed soon. Please use MMC_ATMEL_MCI.
 
 	  If unsure, say N.

drivers/net/wireless/Kconfig +1 -5

index 6deaae1..28aa05f 100644
@@ -156,11 +156,7 @@ config PRISM54
 	---help---
 	  This enables support for FullMAC PCI/Cardbus prism54 devices. This
 	  driver is now deprecated in favor for the SoftMAC driver, p54pci.
-	  p54pci supports FullMAC PCI/Cardbus devices as well. For details on
-	  the scheduled removal of this driver on the kernel see the feature
-	  removal schedule:
-
-	  Documentation/feature-removal-schedule.txt
+	  p54pci supports FullMAC PCI/Cardbus devices as well.
 
 	  For more information refer to the p54 wiki:

Signature · 1 line

1.7.0.4