aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-18 18:30:12 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-18 18:30:12 -0400
commit85ad93ad56f4baf52e7c40f2e01c4df8e14d4c9c (patch)
tree85aa2c6097bf0bff759e77fd9878e21868af804d /drivers/ide
parentd7c526f7db816af57b38e81169d18b27c3efe85c (diff)
ide: set drive->autotune in ide_pci_setup_ports()
Majority of host drivers using IDE PCI layer set drive->autotune, the only exceptions are: generic.c ns87415.c rz1000.c trm290.c * no ->set_pio_mode method it821x.c: * if memory allocation fails drive->autotune won't be set (but there also won't be ->set_pio_mode method in such case) piix.c: * MPIIX controller (no ->init_hwif method so also no ->set_pio_mode method) However if there is no ->set_pio_mode method there are no changes in behavior w.r.t. PIO tuning so always set drive->autotune in ide_pci_setup_ports(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/pci/aec62xx.c2
-rw-r--r--drivers/ide/pci/alim15x3.c3
-rw-r--r--drivers/ide/pci/amd74xx.c1
-rw-r--r--drivers/ide/pci/atiixp.c2
-rw-r--r--drivers/ide/pci/cmd64x.c2
-rw-r--r--drivers/ide/pci/cs5520.c3
-rw-r--r--drivers/ide/pci/cs5530.c3
-rw-r--r--drivers/ide/pci/cs5535.c2
-rw-r--r--drivers/ide/pci/cy82c693.c3
-rw-r--r--drivers/ide/pci/hpt34x.c3
-rw-r--r--drivers/ide/pci/hpt366.c2
-rw-r--r--drivers/ide/pci/it8213.c3
-rw-r--r--drivers/ide/pci/it821x.c3
-rw-r--r--drivers/ide/pci/jmicron.c3
-rw-r--r--drivers/ide/pci/opti621.c3
-rw-r--r--drivers/ide/pci/pdc202xx_new.c2
-rw-r--r--drivers/ide/pci/pdc202xx_old.c2
-rw-r--r--drivers/ide/pci/piix.c3
-rw-r--r--drivers/ide/pci/sc1200.c3
-rw-r--r--drivers/ide/pci/scc_pata.c3
-rw-r--r--drivers/ide/pci/serverworks.c3
-rw-r--r--drivers/ide/pci/siimage.c2
-rw-r--r--drivers/ide/pci/sis5513.c3
-rw-r--r--drivers/ide/pci/sl82c105.c6
-rw-r--r--drivers/ide/pci/slc90e66.c3
-rw-r--r--drivers/ide/pci/tc86c001.c2
-rw-r--r--drivers/ide/pci/triflex.c3
-rw-r--r--drivers/ide/pci/via82cxxx.c1
-rw-r--r--drivers/ide/setup-pci.c3
29 files changed, 3 insertions, 74 deletions
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index f3912aa8e576..b3dc12a70d51 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -192,8 +192,6 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
192 else 192 else
193 hwif->set_dma_mode = &aec6260_set_mode; 193 hwif->set_dma_mode = &aec6260_set_mode;
194 194
195 hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
196
197 if (hwif->dma_base == 0) 195 if (hwif->dma_base == 0)
198 return; 196 return;
199 197
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 644e054926e3..8ee2b48d105d 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -668,9 +668,6 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
668 if (m5229_revision <= 0xC4) 668 if (m5229_revision <= 0xC4)
669 hwif->host_flags |= IDE_HFLAG_NO_LBA48_DMA; 669 hwif->host_flags |= IDE_HFLAG_NO_LBA48_DMA;
670 670
671 hwif->drives[0].autotune = 1;
672 hwif->drives[1].autotune = 1;
673
674 if (hwif->dma_base == 0) 671 if (hwif->dma_base == 0)
675 return; 672 return;
676 673
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index dc2ab1153d3e..7cafefbf6c1b 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -253,7 +253,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
253 for (i = 0; i < 2; i++) { 253 for (i = 0; i < 2; i++) {
254 hwif->drives[i].io_32bit = 1; 254 hwif->drives[i].io_32bit = 1;
255 hwif->drives[i].unmask = 1; 255 hwif->drives[i].unmask = 1;
256 hwif->drives[i].autotune = 1;
257 } 256 }
258 257
259 if (!hwif->dma_base) 258 if (!hwif->dma_base)
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 47e95806c07f..307843053078 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -174,8 +174,6 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
174 174
175 hwif->set_pio_mode = &atiixp_set_pio_mode; 175 hwif->set_pio_mode = &atiixp_set_pio_mode;
176 hwif->set_dma_mode = &atiixp_set_dma_mode; 176 hwif->set_dma_mode = &atiixp_set_dma_mode;
177 hwif->drives[0].autotune = 1;
178 hwif->drives[1].autotune = 1;
179 177
180 if (!hwif->dma_base) 178 if (!hwif->dma_base)
181 return; 179 return;
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 95ca3b6fd352..adee2ef6fd71 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -506,8 +506,6 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
506 hwif->set_pio_mode = &cmd64x_set_pio_mode; 506 hwif->set_pio_mode = &cmd64x_set_pio_mode;
507 hwif->set_dma_mode = &cmd64x_set_dma_mode; 507 hwif->set_dma_mode = &cmd64x_set_dma_mode;
508 508
509 hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
510
511 if (!hwif->dma_base) 509 if (!hwif->dma_base)
512 return; 510 return;
513 511
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index fd57efb812b3..aa98e817d385 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -123,9 +123,6 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
123 hwif->set_pio_mode = &cs5520_set_pio_mode; 123 hwif->set_pio_mode = &cs5520_set_pio_mode;
124 hwif->set_dma_mode = &cs5520_set_dma_mode; 124 hwif->set_dma_mode = &cs5520_set_dma_mode;
125 125
126 hwif->drives[0].autotune = 1;
127 hwif->drives[1].autotune = 1;
128
129 if (hwif->dma_base == 0) 126 if (hwif->dma_base == 0)
130 return; 127 return;
131 128
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 0324a8a88ef4..ba0c6eba024b 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -255,9 +255,6 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
255 if (CS5530_BAD_PIO(inl(basereg + 8))) 255 if (CS5530_BAD_PIO(inl(basereg + 8)))
256 outl(cs5530_pio_timings[(d0_timings >> 31) & 1][0], basereg + 8); 256 outl(cs5530_pio_timings[(d0_timings >> 31) & 1][0], basereg + 8);
257 257
258 hwif->drives[0].autotune = 1;
259 hwif->drives[1].autotune = 1;
260
261 if (hwif->dma_base == 0) 258 if (hwif->dma_base == 0)
262 return; 259 return;
263 260
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 4360ba301551..5ac82ffa5c09 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -180,8 +180,6 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
180 hwif->set_pio_mode = &cs5535_set_pio_mode; 180 hwif->set_pio_mode = &cs5535_set_pio_mode;
181 hwif->set_dma_mode = &cs5535_set_dma_mode; 181 hwif->set_dma_mode = &cs5535_set_dma_mode;
182 182
183 hwif->drives[1].autotune = hwif->drives[0].autotune = 1;
184
185 if (hwif->dma_base == 0) 183 if (hwif->dma_base == 0)
186 return; 184 return;
187 185
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index e9502ea51a5e..efc20bd97fd5 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -431,9 +431,6 @@ static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif)
431 hwif->chipset = ide_cy82c693; 431 hwif->chipset = ide_cy82c693;
432 hwif->set_pio_mode = &cy82c693_set_pio_mode; 432 hwif->set_pio_mode = &cy82c693_set_pio_mode;
433 433
434 hwif->drives[0].autotune = 1;
435 hwif->drives[1].autotune = 1;
436
437 if (hwif->dma_base == 0) 434 if (hwif->dma_base == 0)
438 return; 435 return;
439 436
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 0b0c08298348..67af1a7dde30 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -127,9 +127,6 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif)
127{ 127{
128 hwif->set_pio_mode = &hpt34x_set_pio_mode; 128 hwif->set_pio_mode = &hpt34x_set_pio_mode;
129 hwif->set_dma_mode = &hpt34x_set_mode; 129 hwif->set_dma_mode = &hpt34x_set_mode;
130
131 hwif->drives[0].autotune = 1;
132 hwif->drives[1].autotune = 1;
133} 130}
134 131
135static ide_pci_device_t hpt34x_chipsets[] __devinitdata = { 132static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 3817c7db616e..18f5b7ddaee6 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1301,8 +1301,6 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
1301 if (new_mcr != old_mcr) 1301 if (new_mcr != old_mcr)
1302 pci_write_config_byte(dev, hwif->select_data + 1, new_mcr); 1302 pci_write_config_byte(dev, hwif->select_data + 1, new_mcr);
1303 1303
1304 hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
1305
1306 if (hwif->dma_base == 0) 1304 if (hwif->dma_base == 0)
1307 return; 1305 return;
1308 1306
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index e0c1d50e50d4..dfbe605120cb 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -170,9 +170,6 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
170 hwif->set_dma_mode = &it8213_set_dma_mode; 170 hwif->set_dma_mode = &it8213_set_dma_mode;
171 hwif->set_pio_mode = &it8213_set_pio_mode; 171 hwif->set_pio_mode = &it8213_set_pio_mode;
172 172
173 hwif->drives[0].autotune = 1;
174 hwif->drives[1].autotune = 1;
175
176 if (!hwif->dma_base) 173 if (!hwif->dma_base)
177 return; 174 return;
178 175
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 611d0f272fbe..ec45b7247209 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -585,9 +585,6 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
585 } else 585 } else
586 hwif->host_flags |= IDE_HFLAG_NO_SET_MODE; 586 hwif->host_flags |= IDE_HFLAG_NO_SET_MODE;
587 587
588 hwif->drives[0].autotune = 1;
589 hwif->drives[1].autotune = 1;
590
591 if (hwif->dma_base == 0) 588 if (hwif->dma_base == 0)
592 return; 589 return;
593 590
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index b058b3a01b30..2eeff670d9a6 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -111,9 +111,6 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
111 hwif->set_pio_mode = &jmicron_set_pio_mode; 111 hwif->set_pio_mode = &jmicron_set_pio_mode;
112 hwif->set_dma_mode = &jmicron_set_dma_mode; 112 hwif->set_dma_mode = &jmicron_set_dma_mode;
113 113
114 hwif->drives[0].autotune = 1;
115 hwif->drives[1].autotune = 1;
116
117 if (hwif->dma_base == 0) 114 if (hwif->dma_base == 0)
118 return; 115 return;
119 116
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 0b15c78d278b..3573ffeaaa34 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -329,9 +329,6 @@ static void __devinit init_hwif_opti621 (ide_hwif_t *hwif)
329 hwif->drives[1].drive_data = PIO_DONT_KNOW; 329 hwif->drives[1].drive_data = PIO_DONT_KNOW;
330 330
331 hwif->set_pio_mode = &opti621_set_pio_mode; 331 hwif->set_pio_mode = &opti621_set_pio_mode;
332
333 hwif->drives[0].autotune = 1;
334 hwif->drives[1].autotune = 1;
335} 332}
336 333
337static ide_pci_device_t opti621_chipsets[] __devinitdata = { 334static ide_pci_device_t opti621_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 415a2282fcbb..d1e7823454f3 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -471,8 +471,6 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
471 hwif->quirkproc = &pdcnew_quirkproc; 471 hwif->quirkproc = &pdcnew_quirkproc;
472 hwif->resetproc = &pdcnew_reset; 472 hwif->resetproc = &pdcnew_reset;
473 473
474 hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
475
476 if (hwif->dma_base == 0) 474 if (hwif->dma_base == 0)
477 return; 475 return;
478 476
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index c34e5936a990..29306121dc4a 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -317,8 +317,6 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
317 if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) 317 if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246)
318 hwif->resetproc = &pdc202xx_reset; 318 hwif->resetproc = &pdc202xx_reset;
319 319
320 hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
321
322 if (hwif->dma_base == 0) 320 if (hwif->dma_base == 0)
323 return; 321 return;
324 322
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 2e29543acff9..ec0c6e96a213 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -344,9 +344,6 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
344 hwif->set_pio_mode = &piix_set_pio_mode; 344 hwif->set_pio_mode = &piix_set_pio_mode;
345 hwif->set_dma_mode = &piix_set_dma_mode; 345 hwif->set_dma_mode = &piix_set_dma_mode;
346 346
347 hwif->drives[0].autotune = 1;
348 hwif->drives[1].autotune = 1;
349
350 if (!hwif->dma_base) 347 if (!hwif->dma_base)
351 return; 348 return;
352 349
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 2471a6dcf6fa..b2423e03bf36 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -365,9 +365,6 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
365 hwif->set_pio_mode = &sc1200_set_pio_mode; 365 hwif->set_pio_mode = &sc1200_set_pio_mode;
366 hwif->set_dma_mode = &sc1200_set_dma_mode; 366 hwif->set_dma_mode = &sc1200_set_dma_mode;
367 367
368 hwif->drives[0].autotune = 1;
369 hwif->drives[1].autotune = 1;
370
371 if (hwif->dma_base == 0) 368 if (hwif->dma_base == 0)
372 return; 369 return;
373 370
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 8ae8f31c41d3..ae9b50331d2a 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -683,9 +683,6 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
683 hwif->ide_dma_test_irq = scc_dma_test_irq; 683 hwif->ide_dma_test_irq = scc_dma_test_irq;
684 hwif->udma_filter = scc_udma_filter; 684 hwif->udma_filter = scc_udma_filter;
685 685
686 hwif->drives[0].autotune = IDE_TUNE_AUTO;
687 hwif->drives[1].autotune = IDE_TUNE_AUTO;
688
689 if (in_be32((void __iomem *)(hwif->config_data + 0xff0)) & CCKCTRL_ATACLKOEN) 686 if (in_be32((void __iomem *)(hwif->config_data + 0xff0)) & CCKCTRL_ATACLKOEN)
690 hwif->ultra_mask = ATA_UDMA6; /* 133MHz */ 687 hwif->ultra_mask = ATA_UDMA6; /* 133MHz */
691 else 688 else
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 6f95cd292927..a3d880e21d0b 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -364,9 +364,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
364 hwif->set_dma_mode = &svwks_set_dma_mode; 364 hwif->set_dma_mode = &svwks_set_dma_mode;
365 hwif->udma_filter = &svwks_udma_filter; 365 hwif->udma_filter = &svwks_udma_filter;
366 366
367 hwif->drives[0].autotune = 1;
368 hwif->drives[1].autotune = 1;
369
370 if (!hwif->dma_base) 367 if (!hwif->dma_base)
371 return; 368 return;
372 369
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index faf0be31ba57..689786df1ede 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -882,8 +882,6 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
882 } 882 }
883 } 883 }
884 884
885 hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
886
887 if (hwif->dma_base == 0) 885 if (hwif->dma_base == 0)
888 return; 886 return;
889 887
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 674a5bb79550..c1d280b06391 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -570,9 +570,6 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
570 if (chipset_family >= ATA_133) 570 if (chipset_family >= ATA_133)
571 hwif->udma_filter = sis5513_ata133_udma_filter; 571 hwif->udma_filter = sis5513_ata133_udma_filter;
572 572
573 hwif->drives[0].autotune = 1;
574 hwif->drives[1].autotune = 1;
575
576 if (hwif->dma_base == 0) 573 if (hwif->dma_base == 0)
577 return; 574 return;
578 575
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index ea6d925ac573..0dce459b1269 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -368,12 +368,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
368 hwif->drives[0].io_32bit = hwif->drives[1].io_32bit = 1; 368 hwif->drives[0].io_32bit = hwif->drives[1].io_32bit = 1;
369 hwif->drives[0].unmask = hwif->drives[1].unmask = 1; 369 hwif->drives[0].unmask = hwif->drives[1].unmask = 1;
370 370
371 /*
372 * We always autotune PIO, this is done before DMA is checked,
373 * so there's no risk of accidentally disabling DMA
374 */
375 hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
376
377 if (!hwif->dma_base) 371 if (!hwif->dma_base)
378 return; 372 return;
379 373
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index d85a48e7deba..4f22dffdf8ef 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -138,9 +138,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
138 138
139 pci_read_config_byte(hwif->pci_dev, 0x47, &reg47); 139 pci_read_config_byte(hwif->pci_dev, 0x47, &reg47);
140 140
141 hwif->drives[0].autotune = 1;
142 hwif->drives[1].autotune = 1;
143
144 if (hwif->dma_base == 0) 141 if (hwif->dma_base == 0)
145 return; 142 return;
146 143
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 04fe9b7f6e72..631506e9b5d2 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -184,8 +184,6 @@ static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
184 184
185 hwif->busproc = &tc86c001_busproc; 185 hwif->busproc = &tc86c001_busproc;
186 186
187 hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
188
189 if (!hwif->dma_base) 187 if (!hwif->dma_base)
190 return; 188 return;
191 189
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index a93dc9bcf990..30b52f62699a 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -100,9 +100,6 @@ static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
100{ 100{
101 hwif->set_pio_mode = &triflex_set_pio_mode; 101 hwif->set_pio_mode = &triflex_set_pio_mode;
102 hwif->set_dma_mode = &triflex_set_mode; 102 hwif->set_dma_mode = &triflex_set_mode;
103
104 hwif->drives[0].autotune = 1;
105 hwif->drives[1].autotune = 1;
106} 103}
107 104
108static ide_pci_device_t triflex_device __devinitdata = { 105static ide_pci_device_t triflex_device __devinitdata = {
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 70e6c44ec699..c8022a92a0e3 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -437,7 +437,6 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
437 for (i = 0; i < 2; i++) { 437 for (i = 0; i < 2; i++) {
438 hwif->drives[i].io_32bit = 1; 438 hwif->drives[i].io_32bit = 1;
439 hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1; 439 hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;
440 hwif->drives[i].autotune = 1;
441 } 440 }
442 441
443 if (!hwif->dma_base) 442 if (!hwif->dma_base)
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 7989f521b801..fff567bcedbe 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -577,6 +577,9 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
577 hwif->ultra_mask = d->udma_mask; 577 hwif->ultra_mask = d->udma_mask;
578 } 578 }
579 579
580 hwif->drives[0].autotune = 1;
581 hwif->drives[1].autotune = 1;
582
580 if (d->init_hwif) 583 if (d->init_hwif)
581 /* Call chipset-specific routine 584 /* Call chipset-specific routine
582 * for each enabled hwif 585 * for each enabled hwif