aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTobias Oed <tobiasoed@hotmail.com>2006-06-26 03:26:19 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 12:58:28 -0400
commit1ba70a019599b4fa3e091c6dbc4a04e2c607eea3 (patch)
treea4ceed29e47bef02c46de92b529940dd845a07d0 /drivers
parentfb4ece268bfebaa9f8084b3aa854b56867935724 (diff)
[PATCH] Remove code that has long been commented out from pdc20265_old
Signed-off-by: Tobias Oed <tobiasoed@hotmail.com> Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/pci/pdc202xx_old.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index e4d87170b370..22d17548ecdb 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -414,8 +414,6 @@ static void pdc202xx_old_ide_dma_start(ide_drive_t *drive)
414 if (drive->addressing == 1) { 414 if (drive->addressing == 1) {
415 struct request *rq = HWGROUP(drive)->rq; 415 struct request *rq = HWGROUP(drive)->rq;
416 ide_hwif_t *hwif = HWIF(drive); 416 ide_hwif_t *hwif = HWIF(drive);
417// struct pci_dev *dev = hwif->pci_dev;
418// unsgned long high_16 = pci_resource_start(dev, 4);
419 unsigned long high_16 = hwif->dma_master; 417 unsigned long high_16 = hwif->dma_master;
420 unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20); 418 unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
421 u32 word_count = 0; 419 u32 word_count = 0;
@@ -435,7 +433,6 @@ static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)
435{ 433{
436 if (drive->addressing == 1) { 434 if (drive->addressing == 1) {
437 ide_hwif_t *hwif = HWIF(drive); 435 ide_hwif_t *hwif = HWIF(drive);
438// unsigned long high_16 = pci_resource_start(hwif->pci_dev, 4);
439 unsigned long high_16 = hwif->dma_master; 436 unsigned long high_16 = hwif->dma_master;
440 unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20); 437 unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
441 u8 clock = 0; 438 u8 clock = 0;
@@ -452,8 +449,6 @@ static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)
452static int pdc202xx_old_ide_dma_test_irq(ide_drive_t *drive) 449static int pdc202xx_old_ide_dma_test_irq(ide_drive_t *drive)
453{ 450{
454 ide_hwif_t *hwif = HWIF(drive); 451 ide_hwif_t *hwif = HWIF(drive);
455// struct pci_dev *dev = hwif->pci_dev;
456// unsigned long high_16 = pci_resource_start(dev, 4);
457 unsigned long high_16 = hwif->dma_master; 452 unsigned long high_16 = hwif->dma_master;
458 u8 dma_stat = hwif->INB(hwif->dma_status); 453 u8 dma_stat = hwif->INB(hwif->dma_status);
459 u8 sc1d = hwif->INB((high_16 + 0x001d)); 454 u8 sc1d = hwif->INB((high_16 + 0x001d));
@@ -491,7 +486,6 @@ static int pdc202xx_ide_dma_timeout(ide_drive_t *drive)
491 486
492static void pdc202xx_reset_host (ide_hwif_t *hwif) 487static void pdc202xx_reset_host (ide_hwif_t *hwif)
493{ 488{
494// unsigned long high_16 = hwif->dma_base - (8*(hwif->channel));
495 unsigned long high_16 = hwif->dma_master; 489 unsigned long high_16 = hwif->dma_master;
496 u8 udma_speed_flag = hwif->INB(high_16|0x001f); 490 u8 udma_speed_flag = hwif->INB(high_16|0x001f);
497 491