diff --git a/[refs] b/[refs] index 82a5d4565f96..5d92e874ad9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ae4b3199ab1b6d511c6e0948e92049c272a346a +refs/heads/master: e4634d4ef04fe6d7b114b612e5b71a84187ce76a diff --git a/trunk/drivers/ide/ide-dma.c b/trunk/drivers/ide/ide-dma.c index 2dacd802c72c..1185f5a4c154 100644 --- a/trunk/drivers/ide/ide-dma.c +++ b/trunk/drivers/ide/ide-dma.c @@ -525,7 +525,6 @@ void ide_dma_start(ide_drive_t *drive) outb(dma_cmd | 1, hwif->dma_base + ATA_DMA_CMD); } - hwif->dma = 1; wmb(); } @@ -564,7 +563,6 @@ int __ide_dma_end (ide_drive_t *drive) /* purge DMA mappings */ ide_destroy_dmatable(drive); /* verify good DMA status */ - hwif->dma = 0; wmb(); return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; } diff --git a/trunk/drivers/ide/pci/scc_pata.c b/trunk/drivers/ide/pci/scc_pata.c index e92a874b31df..9105a39398e2 100644 --- a/trunk/drivers/ide/pci/scc_pata.c +++ b/trunk/drivers/ide/pci/scc_pata.c @@ -353,7 +353,6 @@ static void scc_dma_start(ide_drive_t *drive) /* start DMA */ scc_ide_outb(dma_cmd | 1, hwif->dma_base); - hwif->dma = 1; wmb(); } @@ -374,7 +373,6 @@ static int __scc_dma_end(ide_drive_t *drive) /* purge DMA mappings */ ide_destroy_dmatable(drive); /* verify good DMA status */ - hwif->dma = 0; wmb(); return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; } diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index 7fd1ec135510..fdec0108dba1 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -756,8 +756,6 @@ typedef struct hwif_s { void *hwif_data; /* extra hwif data */ - unsigned dma; - #ifdef CONFIG_BLK_DEV_IDEACPI struct ide_acpi_hwif_link *acpidata; #endif