ide: remove some obsoleted kernel params (v2)
Remove * "hdx=serialize" * "idex=noautotune" * "idex=autotune" kernel params, they have been obsoleted for ages. "idex=serialize", "hdx=noautotune" and "hdx=autotune" are still available so there is no funcionality loss caused by this patch. v2: * fix CONFIG_BLK_DEV_4DRIVES=y build broken by version 1 of the patch [ /me wearing brown paper bag ] Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
parent
e76ecf86da
commit
b6209a90ec
|
|
@ -233,6 +233,8 @@ Summary of ide driver parameters for kernel command line
|
|||
"hdx=remap63" : remap the drive: add 63 to all sector numbers
|
||||
(for DM OnTrack)
|
||||
|
||||
"idex=noautotune" : driver will NOT attempt to tune interface speed
|
||||
|
||||
"hdx=autotune" : driver will attempt to tune interface speed
|
||||
to the fastest PIO mode supported,
|
||||
if possible for this drive only.
|
||||
|
|
@ -268,17 +270,6 @@ Summary of ide driver parameters for kernel command line
|
|||
|
||||
"idex=base,ctl,irq" : specify base, ctl, and irq number
|
||||
|
||||
"idex=autotune" : driver will attempt to tune interface speed
|
||||
to the fastest PIO mode supported,
|
||||
for all drives on this interface.
|
||||
Not fully supported by all chipset types,
|
||||
and quite likely to cause trouble with
|
||||
older/odd IDE drives.
|
||||
|
||||
"idex=noautotune" : driver will NOT attempt to tune interface speed
|
||||
This is the default for most chipsets,
|
||||
except the cmd640.
|
||||
|
||||
"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
|
||||
|
|
|
|||
|
|
@ -1578,7 +1578,7 @@ static int __init ide_setup(char *s)
|
|||
*/
|
||||
if (s[0] == 'h' && s[1] == 'd' && s[2] >= 'a' && s[2] <= max_drive) {
|
||||
const char *hd_words[] = {
|
||||
"none", "noprobe", "nowerr", "cdrom", "serialize",
|
||||
"none", "noprobe", "nowerr", "cdrom", "minus5",
|
||||
"autotune", "noautotune", "minus8", "swapdata", "bswap",
|
||||
"noflush", "remap", "remap63", "scsi", NULL };
|
||||
unit = s[2] - 'a';
|
||||
|
|
@ -1606,9 +1606,6 @@ static int __init ide_setup(char *s)
|
|||
drive->ready_stat = 0;
|
||||
hwif->noprobe = 0;
|
||||
goto done;
|
||||
case -5: /* "serialize" */
|
||||
printk(" -- USE \"ide%d=serialize\" INSTEAD", hw);
|
||||
goto do_serialize;
|
||||
case -6: /* "autotune" */
|
||||
drive->autotune = IDE_TUNE_AUTO;
|
||||
goto obsolete_option;
|
||||
|
|
@ -1669,7 +1666,7 @@ static int __init ide_setup(char *s)
|
|||
* (-8, -9, -10) are reserved to ease the hardcoding.
|
||||
*/
|
||||
static const char *ide_words[] = {
|
||||
"noprobe", "serialize", "autotune", "noautotune",
|
||||
"noprobe", "serialize", "minus3", "minus4",
|
||||
"reset", "dma", "ata66", "minus8", "minus9",
|
||||
"minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
|
||||
"dtc2278", "umc8672", "ali14xx", NULL };
|
||||
|
|
@ -1740,12 +1737,17 @@ static int __init ide_setup(char *s)
|
|||
hwif->chipset = mate->chipset = ide_4drives;
|
||||
mate->irq = hwif->irq;
|
||||
memcpy(mate->io_ports, hwif->io_ports, sizeof(hwif->io_ports));
|
||||
goto do_serialize;
|
||||
hwif->mate = mate;
|
||||
mate->mate = hwif;
|
||||
hwif->serialized = mate->serialized = 1;
|
||||
goto obsolete_option;
|
||||
}
|
||||
#endif /* CONFIG_BLK_DEV_4DRIVES */
|
||||
case -10: /* minus10 */
|
||||
case -9: /* minus9 */
|
||||
case -8: /* minus8 */
|
||||
case -4:
|
||||
case -3:
|
||||
goto bad_option;
|
||||
case -7: /* ata66 */
|
||||
#ifdef CONFIG_BLK_DEV_IDEPCI
|
||||
|
|
@ -1760,16 +1762,7 @@ static int __init ide_setup(char *s)
|
|||
case -5: /* "reset" */
|
||||
hwif->reset = 1;
|
||||
goto obsolete_option;
|
||||
case -4: /* "noautotune" */
|
||||
hwif->drives[0].autotune = IDE_TUNE_NOAUTO;
|
||||
hwif->drives[1].autotune = IDE_TUNE_NOAUTO;
|
||||
goto obsolete_option;
|
||||
case -3: /* "autotune" */
|
||||
hwif->drives[0].autotune = IDE_TUNE_AUTO;
|
||||
hwif->drives[1].autotune = IDE_TUNE_AUTO;
|
||||
goto obsolete_option;
|
||||
case -2: /* "serialize" */
|
||||
do_serialize:
|
||||
hwif->mate = &ide_hwifs[hw^1];
|
||||
hwif->mate->mate = hwif;
|
||||
hwif->serialized = hwif->mate->serialized = 1;
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
* Please set local bus speed using kernel parameter idebus
|
||||
* for example, "idebus=33" stands for 33Mhz VLbus
|
||||
* To activate controller support, use "ide0=qd65xx"
|
||||
* To enable tuning, use "ide0=autotune"
|
||||
* To enable second channel tuning (qd6580 only), use "ide1=autotune"
|
||||
* To enable tuning, use "hda=autotune hdb=autotune"
|
||||
* To enable 2nd channel tuning (qd6580 only), use "hdc=autotune hdd=autotune"
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
* There is a 25/33MHz switch in configuration
|
||||
* register, but driver is written for use at any frequency which get
|
||||
* (use idebus=xx to select PCI bus speed).
|
||||
* Use ide0=autotune for automatical tune of the PIO modes.
|
||||
* Use hda=autotune and hdb=autotune for automatical tune of the PIO modes.
|
||||
* If you get strange results, do not use this and set PIO manually
|
||||
* by hdparm.
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue