ide: remove IDE_HFLAG_CY82C693 host flag

Sergei suggested that it shouldn't be necessary + it had no effect
anyway since ide_id_dma_bug() is called earlier in ide_tune_dma().

Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 3 insertions, 9 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index d61e5788d310..aaece2c06c9d 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 f68b89a05823..833fa4de3081 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,