summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-27 15:38:29 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-27 15:38:29 +0200
commit207daeaabb5396995ebac63415fab71476b64ca3 (patch)
treec3e245104e64feaebf7434772fc49be0c1292f7d
parente160124ff6868e53511b16412d2ea91f87936be0 (diff)
downloadkernel-207daeaabb5396995ebac63415fab71476b64ca3.tar.gz
ide: remove obsoleted "hdx=autotune" kernel parameter
* Remove obsoleted "hdx=autotune" kernel parameter (we always auto-tune PIO if possible nowadays). * Remove no longer needed ide_drive_t.autotune flag. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--Documentation/ide/ide.txt7
-rw-r--r--drivers/ide/ide-probe.c4
-rw-r--r--drivers/ide/ide.c5
-rw-r--r--include/linux/ide.h1
4 files changed, 2 insertions, 15 deletions
diff --git a/Documentation/ide/ide.txt b/Documentation/ide/ide.txt
index eb4d3b7a6214..601e79ecef03 100644
--- a/Documentation/ide/ide.txt
+++ b/Documentation/ide/ide.txt
@@ -196,13 +196,6 @@ Summary of ide driver parameters for kernel command line
"hdx=cyl,head,sect" : disk drive is present, with specified geometry
- "hdx=autotune" : driver will attempt to tune interface speed
- to the fastest PIO mode supported,
- if possible for this drive only.
- Not fully supported by all chipset types,
- and quite likely to cause trouble with
- older/odd IDE drives.
-
"hdx=nodma" : disallow DMA
"ide=doubler" : probe/support IDE doublers on Amiga
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 99972fe3e9e4..ace826f52811 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -827,8 +827,7 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)
ide_drive_t *drive = &hwif->drives[unit];
if (drive->present) {
- if (drive->autotune)
- ide_set_max_pio(drive);
+ ide_set_max_pio(drive);
drive->nice1 = 1;
@@ -1325,7 +1324,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
drive->unmask = 1;
if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS)
drive->no_unmask = 1;
- drive->autotune = 1;
}
if (port_ops && port_ops->port_init_devs)
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index ad34fe98a23c..71fa37979215 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -900,7 +900,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", "nodma",
- "autotune", "-7", "-8", "-9", "-10",
+ "-6", "-7", "-8", "-9", "-10",
"noflush", "remap", "remap63", "scsi", NULL };
unit = s[2] - 'a';
hw = unit / MAX_DRIVES;
@@ -928,9 +928,6 @@ static int __init ide_setup(char *s)
case -5: /* nodma */
drive->nodma = 1;
goto done;
- case -6: /* "autotune" */
- drive->autotune = 1;
- goto obsolete_option;
case -11: /* noflush */
drive->noflush = 1;
goto done;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 0e7d44a6b94a..65dcbcfae162 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -321,7 +321,6 @@ typedef struct ide_drive_s {
unsigned atapi_overlap : 1; /* ATAPI overlap (not supported) */
unsigned doorlocking : 1; /* for removable only: door lock/unlock works */
unsigned nodma : 1; /* disallow DMA */
- unsigned autotune : 1; /* 0=default, 1=autotune */
unsigned remap_0_to_1 : 1; /* 0=noremap, 1=remap 0->1 (for EZDrive) */
unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */
unsigned vdma : 1; /* 1=doing PIO over DMA 0=doing normal DMA */