From 9b8a873c3a6c3dbf7bf2c83f8b1c2cb494a7254e Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Sun, 7 Jun 2009 15:37:05 +0200
Subject: [PATCH] --- yaml --- r: 147915 b: refs/heads/master c:
 ffddf1717b0d388879c646eaf6261a2b393c06ad h: refs/heads/master i:   147913:
 efd32ee2f7f4a11a878025568c333e3b35459224   147911:
 95084146a51714757c1fe7258c69c8348190719d v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/ide/pdc202xx_old.c | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index fe8f78650d6c..8832cc02192c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1221e241e3a6f1ff5b0de03d58d871f7c995781b
+refs/heads/master: ffddf1717b0d388879c646eaf6261a2b393c06ad
diff --git a/trunk/drivers/ide/pdc202xx_old.c b/trunk/drivers/ide/pdc202xx_old.c
index 494b5404f277..4980dd7b2e28 100644
--- a/trunk/drivers/ide/pdc202xx_old.c
+++ b/trunk/drivers/ide/pdc202xx_old.c
@@ -203,22 +203,6 @@ static int pdc202xx_dma_end(ide_drive_t *drive)
 	return ide_dma_end(drive);
 }
 
-static void pdc202xx_reset(ide_drive_t *drive)
-{
-	ide_hwif_t *hwif	= drive->hwif;
-	unsigned long high_16	= hwif->extra_base - 16;
-	u8 udma_speed_flag	= inb(high_16 | 0x001f);
-
-	printk(KERN_WARNING "PDC202xx: software reset...\n");
-
-	outb(udma_speed_flag | 0x10, high_16 | 0x001f);
-	mdelay(100);
-	outb(udma_speed_flag & ~0x10, high_16 | 0x001f);
-	mdelay(2000);	/* 2 seconds ?! */
-
-	ide_set_max_pio(drive);
-}
-
 static int init_chipset_pdc202xx(struct pci_dev *dev)
 {
 	unsigned long dmabase = pci_resource_start(dev, 4);
@@ -279,7 +263,6 @@ static const struct ide_port_ops pdc2026x_port_ops = {
 	.set_pio_mode		= pdc202xx_set_pio_mode,
 	.set_dma_mode		= pdc202xx_set_mode,
 	.quirkproc		= pdc202xx_quirkproc,
-	.resetproc		= pdc202xx_reset,
 	.cable_detect		= pdc2026x_cable_detect,
 };