aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-probe.c4
-rw-r--r--drivers/ide/ide.c5
2 files changed, 2 insertions, 7 deletions
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)
827 ide_drive_t *drive = &hwif->drives[unit]; 827 ide_drive_t *drive = &hwif->drives[unit];
828 828
829 if (drive->present) { 829 if (drive->present) {
830 if (drive->autotune) 830 ide_set_max_pio(drive);
831 ide_set_max_pio(drive);
832 831
833 drive->nice1 = 1; 832 drive->nice1 = 1;
834 833
@@ -1325,7 +1324,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
1325 drive->unmask = 1; 1324 drive->unmask = 1;
1326 if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS) 1325 if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS)
1327 drive->no_unmask = 1; 1326 drive->no_unmask = 1;
1328 drive->autotune = 1;
1329 } 1327 }
1330 1328
1331 if (port_ops && port_ops->port_init_devs) 1329 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)
900 if (s[0] == 'h' && s[1] == 'd' && s[2] >= 'a' && s[2] <= max_drive) { 900 if (s[0] == 'h' && s[1] == 'd' && s[2] >= 'a' && s[2] <= max_drive) {
901 const char *hd_words[] = { 901 const char *hd_words[] = {
902 "none", "noprobe", "nowerr", "cdrom", "nodma", 902 "none", "noprobe", "nowerr", "cdrom", "nodma",
903 "autotune", "-7", "-8", "-9", "-10", 903 "-6", "-7", "-8", "-9", "-10",
904 "noflush", "remap", "remap63", "scsi", NULL }; 904 "noflush", "remap", "remap63", "scsi", NULL };
905 unit = s[2] - 'a'; 905 unit = s[2] - 'a';
906 hw = unit / MAX_DRIVES; 906 hw = unit / MAX_DRIVES;
@@ -928,9 +928,6 @@ static int __init ide_setup(char *s)
928 case -5: /* nodma */ 928 case -5: /* nodma */
929 drive->nodma = 1; 929 drive->nodma = 1;
930 goto done; 930 goto done;
931 case -6: /* "autotune" */
932 drive->autotune = 1;
933 goto obsolete_option;
934 case -11: /* noflush */ 931 case -11: /* noflush */
935 drive->noflush = 1; 932 drive->noflush = 1;
936 goto done; 933 goto done;