From 2d5585b5b848d0c1de2948cd9f160c7754683c32 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sat, 29 Jul 2006 19:48:28 +0200 Subject: [PATCH] --- yaml --- r: 37284 b: refs/heads/master c: a1b3206b362335f7986d1fab294c16148a8c50ab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 9 --------- trunk/drivers/ieee1394/sbp2.c | 10 ---------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/[refs] b/[refs] index b0d0b3cb67d6..81b4f693e232 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8df4083c5291b3647e0381d3c69ab2196f5dd3b7 +refs/heads/master: a1b3206b362335f7986d1fab294c16148a8c50ab diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index d1cd5f93e028..d0e7917b30fb 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -31,15 +31,6 @@ Who: Jody McIntyre --------------------------- -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 - ---------------------------- - 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 diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c index 6adbe1c796c2..1c8ce7acba82 100644 --- a/trunk/drivers/ieee1394/sbp2.c +++ b/trunk/drivers/ieee1394/sbp2.c @@ -173,11 +173,6 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0" ", 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. */ @@ -1554,11 +1549,6 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id, } 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++) {