From c0f36d7c25280143a7fa39e3b686bc467e87f546 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Apr 2008 17:36:38 +0200
Subject: [PATCH] --- yaml --- r: 93566 b: refs/heads/master c:
 951784b667d78dad52ffea0a958fdbe14da97972 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/ide/ide-dma.c      | 10 ++--------
 trunk/drivers/ide/pci/cy82c693.c |  2 +-
 trunk/include/linux/ide.h        |  2 --
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 9f2f3f34e9cd..803db520a70d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb5528ab19ece76be5299b33746ca7d58c187a26
+refs/heads/master: 951784b667d78dad52ffea0a958fdbe14da97972
diff --git a/trunk/drivers/ide/ide-dma.c b/trunk/drivers/ide/ide-dma.c
index d61e5788d310..aaece2c06c9d 100644
--- a/trunk/drivers/ide/ide-dma.c
+++ b/trunk/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/trunk/drivers/ide/pci/cy82c693.c b/trunk/drivers/ide/pci/cy82c693.c
index f68b89a05823..833fa4de3081 100644
--- a/trunk/drivers/ide/pci/cy82c693.c
+++ b/trunk/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/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index 4997751591a3..cd8deba68cb2 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/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 */