Date: Sat, 29 Jul 2006 19:48:28 +0200
From: Adrian Bunk <bunk@stusta.de>
Subject: [RFC: 2.6 patch] the scheduled removal of drivers/ieee1394/sbp2.c:force_inquiry_hack

This patch contains the scheduled removal of the force_inquiry_hack 
module parameter.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Index: linux-2.6.18-rc4-mm1/Documentation/feature-removal-schedule.txt
===================================================================
--- linux-2.6.18-rc4-mm1.orig/Documentation/feature-removal-schedule.txt	2006-08-14 18:12:47.000000000 +0200
+++ linux-2.6.18-rc4-mm1/Documentation/feature-removal-schedule.txt	2006-08-14 18:21:46.000000000 +0200
@@ -23,15 +23,6 @@ Who:	Jody McIntyre <scjody@modernduck.co
 
 ---------------------------
 
-What:	sbp2: module parameter "force_inquiry_hack"
-When:	July 2006
-Why:	Superceded by parameter "workarounds". Both parameters are meant to be
-	used ad-hoc and for single devices only, i.e. not in modprobe.conf,
-	therefore the impact of this feature replacement should be low.
-Who:	Stefan Richter <stefanr@s5r6.in-berlin.de>
-
----------------------------
-
 What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:	July 2006
 Why:	V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
Index: linux-2.6.18-rc4-mm1/drivers/ieee1394/sbp2.c
===================================================================
--- linux-2.6.18-rc4-mm1.orig/drivers/ieee1394/sbp2.c	2006-08-14 18:12:59.000000000 +0200
+++ linux-2.6.18-rc4-mm1/drivers/ieee1394/sbp2.c	2006-08-14 18:21:46.000000000 +0200
@@ -174,11 +174,6 @@ MODULE_PARM_DESC(workarounds, "Work arou
 	", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
 	", or a combination)");
 
-/* legacy parameter */
-static int force_inquiry_hack;
-module_param(force_inquiry_hack, int, 0644);
-MODULE_PARM_DESC(force_inquiry_hack, "Deprecated, use 'workarounds'");
-
 /*
  * Export information about protocols/devices supported by this driver.
  */
@@ -1564,11 +1559,6 @@ static void sbp2_parse_unit_directory(st
 	}
 
 	workarounds = sbp2_default_workarounds;
-	if (force_inquiry_hack) {
-		SBP2_WARN("force_inquiry_hack is deprecated. "
-			  "Use parameter 'workarounds' instead.");
-		workarounds |= SBP2_WORKAROUND_INQUIRY_36;
-	}
 
 	if (!(workarounds & SBP2_WORKAROUND_OVERRIDE))
 		for (i = 0; i < ARRAY_SIZE(sbp2_workarounds_table); i++) {