diff options
-rw-r--r-- | drivers/ide/arm/icside.c | 3 | ||||
-rw-r--r-- | drivers/ide/ide-probe.c | 3 | ||||
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 1 | ||||
-rw-r--r-- | include/linux/ide.h | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index c0cf7fc95207..4211bfbd1582 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
@@ -480,8 +480,7 @@ static const struct ide_port_info icside_v6_port_info __initdata = { | |||
480 | .init_dma = icside_dma_off_init, | 480 | .init_dma = icside_dma_off_init, |
481 | .port_ops = &icside_v6_no_dma_port_ops, | 481 | .port_ops = &icside_v6_no_dma_port_ops, |
482 | .dma_ops = &icside_v6_dma_ops, | 482 | .dma_ops = &icside_v6_dma_ops, |
483 | .host_flags = IDE_HFLAG_SERIALIZE | | 483 | .host_flags = IDE_HFLAG_SERIALIZE, |
484 | IDE_HFLAG_NO_AUTOTUNE, | ||
485 | .mwdma_mask = ATA_MWDMA2, | 484 | .mwdma_mask = ATA_MWDMA2, |
486 | .swdma_mask = ATA_SWDMA2, | 485 | .swdma_mask = ATA_SWDMA2, |
487 | }; | 486 | }; |
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 9b0a3cba2b03..99972fe3e9e4 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1325,8 +1325,7 @@ static void ide_port_init_devices(ide_hwif_t *hwif) | |||
1325 | drive->unmask = 1; | 1325 | drive->unmask = 1; |
1326 | if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS) | 1326 | if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS) |
1327 | drive->no_unmask = 1; | 1327 | drive->no_unmask = 1; |
1328 | if ((hwif->host_flags & IDE_HFLAG_NO_AUTOTUNE) == 0) | 1328 | drive->autotune = 1; |
1329 | drive->autotune = 1; | ||
1330 | } | 1329 | } |
1331 | 1330 | ||
1332 | if (port_ops && port_ops->port_init_devs) | 1331 | if (port_ops && port_ops->port_init_devs) |
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 321a4e28ac19..bfcd2acfede0 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -573,7 +573,6 @@ static const struct ide_port_info sgiioc4_port_info __devinitdata = { | |||
573 | .init_dma = ide_dma_sgiioc4, | 573 | .init_dma = ide_dma_sgiioc4, |
574 | .port_ops = &sgiioc4_port_ops, | 574 | .port_ops = &sgiioc4_port_ops, |
575 | .dma_ops = &sgiioc4_dma_ops, | 575 | .dma_ops = &sgiioc4_dma_ops, |
576 | .host_flags = IDE_HFLAG_NO_AUTOTUNE, | ||
577 | .mwdma_mask = ATA_MWDMA2_ONLY, | 576 | .mwdma_mask = ATA_MWDMA2_ONLY, |
578 | }; | 577 | }; |
579 | 578 | ||
diff --git a/include/linux/ide.h b/include/linux/ide.h index 37d00c2c79c9..0e7d44a6b94a 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1063,8 +1063,6 @@ enum { | |||
1063 | IDE_HFLAG_NO_DMA = (1 << 14), | 1063 | IDE_HFLAG_NO_DMA = (1 << 14), |
1064 | /* check if host is PCI IDE device before allowing DMA */ | 1064 | /* check if host is PCI IDE device before allowing DMA */ |
1065 | IDE_HFLAG_NO_AUTODMA = (1 << 15), | 1065 | IDE_HFLAG_NO_AUTODMA = (1 << 15), |
1066 | /* don't autotune PIO */ | ||
1067 | IDE_HFLAG_NO_AUTOTUNE = (1 << 16), | ||
1068 | /* host is CS5510/CS5520 */ | 1066 | /* host is CS5510/CS5520 */ |
1069 | IDE_HFLAG_CS5520 = IDE_HFLAG_VDMA, | 1067 | IDE_HFLAG_CS5520 = IDE_HFLAG_VDMA, |
1070 | /* no LBA48 */ | 1068 | /* no LBA48 */ |