diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 20:15:22 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 20:15:22 +0200 |
| commit | 88b4132e101e60e8fa67996ae3072ab6b71e8500 (patch) | |
| tree | 6b65c2d0d8691c577d60e6d1f84ad6db172a82d7 /drivers/ide/trm290.c | |
| parent | 11998b316173f814698f9037ce9179d634d1f423 (diff) | |
| download | linux-88b4132e101e60e8fa67996ae3072ab6b71e8500.tar.gz linux-88b4132e101e60e8fa67996ae3072ab6b71e8500.tar.bz2 linux-88b4132e101e60e8fa67996ae3072ab6b71e8500.zip | |
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/trm290.c')
| -rw-r--r-- | drivers/ide/trm290.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c index 0be27cae27d5..c0528f27fcae 100644 --- a/drivers/ide/trm290.c +++ b/drivers/ide/trm290.c @@ -198,9 +198,9 @@ static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) return 1; outl(hwif->dmatable_dma | rw, hwif->dma_base); - drive->waiting_for_dma = 1; /* start DMA */ outw(count * 2 - 1, hwif->dma_base + 2); + return 0; } @@ -211,11 +211,7 @@ static void trm290_dma_start(ide_drive_t *drive) static int trm290_dma_end(ide_drive_t *drive) { - u16 status; - - drive->waiting_for_dma = 0; - - status = inw(drive->hwif->dma_base + 2); + u16 status = inw(drive->hwif->dma_base + 2); trm290_prepare_drive(drive, 0); |