The patch titled
Remove code that has long been commented out from pdc20265_old
has been added to the -mm tree. Its filename is
remove-code-that-has-long-been-commented-out-from-pdc20265_old.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Remove code that has long been commented out from pdc20265_old
From: "Tobias Oed" <tobiasoed@xxxxxxxxxxx>
Signed-off-by: Tobias Oed <tobiasoed@xxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@xxxxxxxxxxxxxx>
Cc: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/pci/pdc202xx_old.c | 6 ------
1 file changed, 6 deletions(-)
diff -puN drivers/ide/pci/pdc202xx_old.c~remove-code-that-has-long-been-commented-out-from-pdc20265_old drivers/ide/pci/pdc202xx_old.c
--- a/drivers/ide/pci/pdc202xx_old.c~remove-code-that-has-long-been-commented-out-from-pdc20265_old
+++ a/drivers/ide/pci/pdc202xx_old.c
@@ -414,8 +414,6 @@ static void pdc202xx_old_ide_dma_start(i
if (drive->addressing == 1) {
struct request *rq = HWGROUP(drive)->rq;
ide_hwif_t *hwif = HWIF(drive);
-// struct pci_dev *dev = hwif->pci_dev;
-// unsgned long high_16 = pci_resource_start(dev, 4);
unsigned long high_16 = hwif->dma_master;
unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
u32 word_count = 0;
@@ -435,7 +433,6 @@ static int pdc202xx_old_ide_dma_end(ide_
{
if (drive->addressing == 1) {
ide_hwif_t *hwif = HWIF(drive);
-// unsigned long high_16 = pci_resource_start(hwif->pci_dev, 4);
unsigned long high_16 = hwif->dma_master;
unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
u8 clock = 0;
@@ -452,8 +449,6 @@ static int pdc202xx_old_ide_dma_end(ide_
static int pdc202xx_old_ide_dma_test_irq(ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
-// struct pci_dev *dev = hwif->pci_dev;
-// unsigned long high_16 = pci_resource_start(dev, 4);
unsigned long high_16 = hwif->dma_master;
u8 dma_stat = hwif->INB(hwif->dma_status);
u8 sc1d = hwif->INB((high_16 + 0x001d));
@@ -491,7 +486,6 @@ static int pdc202xx_ide_dma_timeout(ide_
static void pdc202xx_reset_host (ide_hwif_t *hwif)
{
-// unsigned long high_16 = hwif->dma_base - (8*(hwif->channel));
unsigned long high_16 = hwif->dma_master;
u8 udma_speed_flag = hwif->INB(high_16|0x001f);
_
Patches currently in -mm which might be from tobiasoed@xxxxxxxxxxx are
ide-pdc202xx_oldc-remove-unneeded-tuneproc-call.patch
pdc202xx_old-depends-on-config_blk_dev_idedma.patch
remove-code-that-has-long-been-commented-out-from-pdc20265_old.patch
enable-cdrom-dma-access-with-pdc20265_old.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
