Skip to content

Commit

Permalink
ide: remove obsoleted "hdx=autotune" kernel parameter
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Apr 27, 2008
1 parent e160124 commit 207daea
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 15 deletions.
7 changes: 0 additions & 7 deletions Documentation/ide/ide.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions drivers/ide/ide-probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions drivers/ide/ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion include/linux/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 207daea

Please sign in to comment.