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/tx4939ide.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/tx4939ide.c')
-rw-r--r-- | drivers/ide/tx4939ide.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 7267c46c07cd..faf0d97b9ce8 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c | |||
@@ -304,8 +304,6 @@ static int tx4939ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) | |||
304 | /* clear INTR & ERROR flags */ | 304 | /* clear INTR & ERROR flags */ |
305 | tx4939ide_clear_dma_status(base); | 305 | tx4939ide_clear_dma_status(base); |
306 | 306 | ||
307 | drive->waiting_for_dma = 1; | ||
308 | |||
309 | tx4939ide_writew(SECTOR_SIZE / 2, base, drive->dn ? | 307 | tx4939ide_writew(SECTOR_SIZE / 2, base, drive->dn ? |
310 | TX4939IDE_Xfer_Cnt_2 : TX4939IDE_Xfer_Cnt_1); | 308 | TX4939IDE_Xfer_Cnt_2 : TX4939IDE_Xfer_Cnt_1); |
311 | 309 | ||
@@ -321,8 +319,6 @@ static int tx4939ide_dma_end(ide_drive_t *drive) | |||
321 | void __iomem *base = TX4939IDE_BASE(hwif); | 319 | void __iomem *base = TX4939IDE_BASE(hwif); |
322 | u16 ctl = tx4939ide_readw(base, TX4939IDE_Int_Ctl); | 320 | u16 ctl = tx4939ide_readw(base, TX4939IDE_Int_Ctl); |
323 | 321 | ||
324 | drive->waiting_for_dma = 0; | ||
325 | |||
326 | /* get DMA command mode */ | 322 | /* get DMA command mode */ |
327 | dma_cmd = tx4939ide_readb(base, TX4939IDE_DMA_Cmd); | 323 | dma_cmd = tx4939ide_readb(base, TX4939IDE_DMA_Cmd); |
328 | /* stop DMA */ | 324 | /* stop DMA */ |