[PATCH] pdc202xx_old: remove the obsolete busproc

[PATCH] pdc202xx_old: remove the obsolete busproc

[Sergei Shtylyov]

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

Hello.

    Remove the busproc from pdc202xx_old.c because:

1) it handles the obsolete HDIO_TRISTATE_HWIF ioctl instead of the modern 
HDIO_SET_BUSSTATE, so treats its argument wrong;
2) I don't think that tristating both channels is good idea (probably can't be 
done otherwise since there seems to be only single bit controlling this).

MBR, Sergei

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>


[-- Attachment #2: pdc202xx_old-remove-busproc.patch --]
[-- Type: text/plain, Size: 1471 bytes --]

Index: linus/drivers/ide/pci/pdc202xx_old.c
===================================================================
--- linus.orig/drivers/ide/pci/pdc202xx_old.c
+++ linus/drivers/ide/pci/pdc202xx_old.c
@@ -550,31 +550,6 @@ static void pdc202xx_reset (ide_drive_t 
 #endif
 }
 
-/*
- * Since SUN Cobalt is attempting to do this operation, I should disclose
- * this has been a long time ago Thu Jul 27 16:40:57 2000 was the patch date
- * HOTSWAP ATA Infrastructure.
- */
-static int pdc202xx_tristate (ide_drive_t * drive, int state)
-{
-	ide_hwif_t *hwif	= HWIF(drive);
-//	unsigned long high_16	= hwif->dma_base - (8*(hwif->channel));
-	unsigned long high_16	= hwif->dma_master;
-	u8 sc1f			= hwif->INB(high_16|0x001f);
-
-	if (!hwif)
-		return -EINVAL;
-
-//	hwif->bus_state = state;
-
-	if (state) {
-		hwif->OUTB(sc1f | 0x08, (high_16|0x001f));
-	} else {
-		hwif->OUTB(sc1f & ~0x08, (high_16|0x001f));
-	}
-	return 0;
-}
-
 static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev, const char *name)
 {
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
@@ -624,10 +599,8 @@ static void __devinit init_hwif_pdc202xx
 	hwif->tuneproc  = &config_chipset_for_pio;
 	hwif->quirkproc = &pdc202xx_quirkproc;
 
-	if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) {
-		hwif->busproc   = &pdc202xx_tristate;
+	if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246)
 		hwif->resetproc = &pdc202xx_reset;
-	}
 
 	hwif->speedproc = &pdc202xx_tune_chipset;