diff options
| -rw-r--r-- | drivers/ide/ide-dma.c | 10 | ||||
| -rw-r--r-- | drivers/ide/pci/cy82c693.c | 2 | ||||
| -rw-r--r-- | include/linux/ide.h | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index d61e5788d31..aaece2c06c9 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -703,14 +703,8 @@ static int ide_tune_dma(ide_drive_t *drive) speed = ide_max_dma_mode(drive); - if (!speed) { - /* is this really correct/needed? */ - if ((hwif->host_flags & IDE_HFLAG_CY82C693) && - ide_dma_good_drive(drive)) - return 1; - else - return 0; - } + if (!speed) + return 0; if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE) return 1; diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index f68b89a0582..833fa4de308 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c @@ -410,7 +410,7 @@ static const struct ide_port_info cy82c693_chipset __devinitdata = { .init_iops = init_iops_cy82c693, .init_hwif = init_hwif_cy82c693, .chipset = ide_cy82c693, - .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_CY82C693, + .host_flags = IDE_HFLAG_SINGLE, .pio_mask = ATA_PIO4, .swdma_mask = ATA_SWDMA2, .mwdma_mask = ATA_MWDMA2, diff --git a/include/linux/ide.h b/include/linux/ide.h index 4997751591a..cd8deba68cb 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1085,8 +1085,6 @@ enum { /* unmask IRQs */ IDE_HFLAG_UNMASK_IRQS = (1 << 25), IDE_HFLAG_ABUSE_SET_DMA_MODE = (1 << 26), - /* host is CY82C693 */ - IDE_HFLAG_CY82C693 = (1 << 27), /* force host out of "simplex" mode */ IDE_HFLAG_CLEAR_SIMPLEX = (1 << 28), /* DSC overlap is unsupported */ |