[PATCH 4/5] ide: remove obsoleted "idex=serialize" kernel parameter

Bartlomiej Zolnierkiewicz
2008-03-10T23:35:36Z

Remove obsoleted "idex=serialize" kernel parameter
(it has been obsoleted since 1 Nov 2004).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
Documentation/ide/ide.txt | 5 -----
drivers/ide/ide.c | 9 ++-------
2 files changed, 2 insertions(+), 12 deletions(-)

Index: b/Documentation/ide/ide.txt
===================================================================
--- a/Documentation/ide/ide.txt
+++ b/Documentation/ide/ide.txt
@@ -235,11 +235,6 @@ Summary of ide driver parameters for ker
As for VLB, it is safest to not specify it.
Bigger values are safer than smaller ones.

- "idex=serialize" : do not overlap operations on idex. Please note
- that you will have to specify this option for
- both the respective primary and secondary channel
- to take effect.
-
"idex=reset" : reset interface after probe

"ide=reverse" : formerly called to pci sub-system, but now local.
Index: b/drivers/ide/ide.c
===================================================================
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1005,7 +1005,7 @@ static int __init ide_setup(char *s)
* (-8, -9, -10) are reserved to ease the hardcoding.
*/
static const char *ide_words[] = {
- "minus1", "serialize", "minus3", "minus4",
+ "minus1", "minus2", "minus3", "minus4",
"reset", "minus6", "ata66", "minus8", "minus9",
"minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
"dtc2278", "umc8672", "ali14xx", NULL };
@@ -1091,12 +1091,7 @@ static int __init ide_setup(char *s)
case -5: /* "reset" */
hwif->reset = 1;
goto obsolete_option;
- case -2: /* "serialize" */
- hwif->mate = &ide_hwifs[hw^1];
- hwif->mate->mate = hwif;
- hwif->serialized = hwif->mate->serialized = 1;
- goto obsolete_option;
-
+ case -2:
case -1:
case 0:
case 1: