ide: remove superfluous ->dma field from ide_hwif_t
Bartlomiej Zolnierkiewicz [Mon, 13 Oct 2008 19:39:37 +0000 (21:39 +0200)]
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-dma.c
drivers/ide/pci/scc_pata.c
include/linux/ide.h

index 2dacd80..1185f5a 100644 (file)
@@ -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;
 }
index e92a874..9105a39 100644 (file)
@@ -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;
 }
index 7fd1ec1..fdec010 100644 (file)
@@ -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