[PATCH 8/9] ide: remove superfluous ->dma field from ide_hwif_t

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Bartlomiej Zolnierkiewicz
Date: Sunday, August 17, 2008 - 10:15 am

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/ide-dma.c      |    2 --
 drivers/ide/pci/scc_pata.c |    2 --
 include/linux/ide.h        |    2 --
 3 files changed, 6 deletions(-)

Index: b/drivers/ide/ide-dma.c
===================================================================
--- a/drivers/ide/ide-dma.c
+++ b/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;
 }
Index: b/drivers/ide/pci/scc_pata.c
===================================================================
--- 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 *d
 
 	/* 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 *dr
 	/* 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: b/include/linux/ide.h
===================================================================
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -745,8 +745,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
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/9] ide: fix IDE ACPI for slave device-only config ..., Bartlomiej Zolnierki ..., (Sun Aug 17, 10:14 am)
[PATCH 2/9] ide-disk: set_addressing() fixes, Bartlomiej Zolnierki ..., (Sun Aug 17, 10:15 am)
[PATCH 3/9] ide-disk: remove stale init_idedisk_capacity() ..., Bartlomiej Zolnierki ..., (Sun Aug 17, 10:15 am)
[PATCH 4/9] ide-disk: add ide_do_setfeature() helper, Bartlomiej Zolnierki ..., (Sun Aug 17, 10:15 am)
[PATCH 5/9] ide: add device flags, Bartlomiej Zolnierki ..., (Sun Aug 17, 10:15 am)
[PATCH 6/9] ide: DMA_PIO_RETRY -&gt; IDE_DFLAG_DMA_PIO_RETRY, Bartlomiej Zolnierki ..., (Sun Aug 17, 10:15 am)
[PATCH 7/9] ide: remove superfluous -&gt;media field from ide ..., Bartlomiej Zolnierki ..., (Sun Aug 17, 10:15 am)
[PATCH 8/9] ide: remove superfluous ->dma field from ide_h ..., Bartlomiej Zolnierki ..., (Sun Aug 17, 10:15 am)
[PATCH 9/9] ide: remove superfluous -&gt;waiting_for_dma checks, Bartlomiej Zolnierki ..., (Sun Aug 17, 10:15 am)
Re: [PATCH 4/9] ide-disk: add ide_do_setfeature() helper, Sergei Shtylyov, (Wed Aug 20, 3:04 am)
Re: [PATCH 2/9] ide-disk: set_addressing() fixes, Sergei Shtylyov, (Sat Aug 23, 2:45 pm)
Re: [PATCH 2/9] ide-disk: set_addressing() fixes, Bartlomiej Zolnierki ..., (Mon Aug 25, 1:23 pm)