aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/ide-dma.c2
-rw-r--r--drivers/ide/pci/scc_pata.c2
-rw-r--r--include/linux/ide.h2
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 2dacd802c72c..1185f5a4c154 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -525,7 +525,6 @@ void ide_dma_start(ide_drive_t *drive)
525 outb(dma_cmd | 1, hwif->dma_base + ATA_DMA_CMD); 525 outb(dma_cmd | 1, hwif->dma_base + ATA_DMA_CMD);
526 } 526 }
527 527
528 hwif->dma = 1;
529 wmb(); 528 wmb();
530} 529}
531 530
@@ -564,7 +563,6 @@ int __ide_dma_end (ide_drive_t *drive)
564 /* purge DMA mappings */ 563 /* purge DMA mappings */
565 ide_destroy_dmatable(drive); 564 ide_destroy_dmatable(drive);
566 /* verify good DMA status */ 565 /* verify good DMA status */
567 hwif->dma = 0;
568 wmb(); 566 wmb();
569 return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; 567 return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
570} 568}
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index e92a874b31df..9105a39398e2 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -353,7 +353,6 @@ static void scc_dma_start(ide_drive_t *drive)
353 353
354 /* start DMA */ 354 /* start DMA */
355 scc_ide_outb(dma_cmd | 1, hwif->dma_base); 355 scc_ide_outb(dma_cmd | 1, hwif->dma_base);
356 hwif->dma = 1;
357 wmb(); 356 wmb();
358} 357}
359 358
@@ -374,7 +373,6 @@ static int __scc_dma_end(ide_drive_t *drive)
374 /* purge DMA mappings */ 373 /* purge DMA mappings */
375 ide_destroy_dmatable(drive); 374 ide_destroy_dmatable(drive);
376 /* verify good DMA status */ 375 /* verify good DMA status */
377 hwif->dma = 0;
378 wmb(); 376 wmb();
379 return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; 377 return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
380} 378}
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 7fd1ec135510..fdec0108dba1 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -756,8 +756,6 @@ typedef struct hwif_s {
756 756
757 void *hwif_data; /* extra hwif data */ 757 void *hwif_data; /* extra hwif data */
758 758
759 unsigned dma;
760
761#ifdef CONFIG_BLK_DEV_IDEACPI 759#ifdef CONFIG_BLK_DEV_IDEACPI
762 struct ide_acpi_hwif_link *acpidata; 760 struct ide_acpi_hwif_link *acpidata;
763#endif 761#endif