Selaa lähdekoodia

ide: remove obsoleted "idex=serialize" kernel parameter

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

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz 17 vuotta sitten
vanhempi
commit
9dd4cf1fb9
2 muutettua tiedostoa jossa 2 lisäystä ja 12 poistoa
  1. 0 5
      Documentation/ide/ide.txt
  2. 2 7
      drivers/ide/ide.c

+ 0 - 5
Documentation/ide/ide.txt

@@ -217,11 +217,6 @@ Summary of ide driver parameters for kernel command line
 			  As for VLB, it is safest to not specify it.
 			  As for VLB, it is safest to not specify it.
 			  Bigger values are safer than smaller ones.
 			  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
  "idex=reset"		: reset interface after probe
 
 
  "ide=doubler"		: probe/support IDE doublers on Amiga
  "ide=doubler"		: probe/support IDE doublers on Amiga

+ 2 - 7
drivers/ide/ide.c

@@ -995,7 +995,7 @@ static int __init ide_setup(char *s)
 		 * (-8, -9, -10) are reserved to ease the hardcoding.
 		 * (-8, -9, -10) are reserved to ease the hardcoding.
 		 */
 		 */
 		static const char *ide_words[] = {
 		static const char *ide_words[] = {
-			"minus1", "serialize", "minus3", "minus4",
+			"minus1", "minus2", "minus3", "minus4",
 			"reset", "minus6", "ata66", "minus8", "minus9",
 			"reset", "minus6", "ata66", "minus8", "minus9",
 			"minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
 			"minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
 			"dtc2278", "umc8672", "ali14xx", NULL };
 			"dtc2278", "umc8672", "ali14xx", NULL };
@@ -1076,12 +1076,7 @@ static int __init ide_setup(char *s)
 			case -5: /* "reset" */
 			case -5: /* "reset" */
 				hwif->reset = 1;
 				hwif->reset = 1;
 				goto obsolete_option;
 				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 -1:
 			case 0:
 			case 0:
 			case 1:
 			case 1: