diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:22 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:22 -0400 |
commit | 88b4132e101e60e8fa67996ae3072ab6b71e8500 (patch) | |
tree | 6b65c2d0d8691c577d60e6d1f84ad6db172a82d7 /drivers/ide/ide-dma-sff.c | |
parent | 11998b316173f814698f9037ce9179d634d1f423 (diff) |
ide: set/clear drive->waiting_for_dma flag in the core code
Set/clear drive->waiting_for_dma flag in the core code
instead of in ->dma_setup and ->dma_end methods.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma-sff.c')
-rw-r--r-- | drivers/ide/ide-dma-sff.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ide/ide-dma-sff.c b/drivers/ide/ide-dma-sff.c index e10054b827a0..f8c7d0cd2ff8 100644 --- a/drivers/ide/ide-dma-sff.c +++ b/drivers/ide/ide-dma-sff.c | |||
@@ -216,7 +216,6 @@ int ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) | |||
216 | /* clear INTR & ERROR flags */ | 216 | /* clear INTR & ERROR flags */ |
217 | ide_dma_sff_write_status(hwif, dma_stat | ATA_DMA_ERR | ATA_DMA_INTR); | 217 | ide_dma_sff_write_status(hwif, dma_stat | ATA_DMA_ERR | ATA_DMA_INTR); |
218 | 218 | ||
219 | drive->waiting_for_dma = 1; | ||
220 | return 0; | 219 | return 0; |
221 | } | 220 | } |
222 | EXPORT_SYMBOL_GPL(ide_dma_setup); | 221 | EXPORT_SYMBOL_GPL(ide_dma_setup); |
@@ -290,8 +289,6 @@ int ide_dma_end(ide_drive_t *drive) | |||
290 | ide_hwif_t *hwif = drive->hwif; | 289 | ide_hwif_t *hwif = drive->hwif; |
291 | u8 dma_stat = 0, dma_cmd = 0, mask; | 290 | u8 dma_stat = 0, dma_cmd = 0, mask; |
292 | 291 | ||
293 | drive->waiting_for_dma = 0; | ||
294 | |||
295 | /* stop DMA */ | 292 | /* stop DMA */ |
296 | if (hwif->host_flags & IDE_HFLAG_MMIO) { | 293 | if (hwif->host_flags & IDE_HFLAG_MMIO) { |
297 | dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD)); | 294 | dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD)); |