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/pmac.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/pmac.c')
-rw-r--r-- | drivers/ide/pmac.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index 1df7b7636453..879c3d8d9f36 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
@@ -1517,8 +1517,6 @@ static int pmac_ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) | |||
1517 | (void)readl(PMAC_IDE_REG(IDE_TIMING_CONFIG)); | 1517 | (void)readl(PMAC_IDE_REG(IDE_TIMING_CONFIG)); |
1518 | } | 1518 | } |
1519 | 1519 | ||
1520 | drive->waiting_for_dma = 1; | ||
1521 | |||
1522 | return 0; | 1520 | return 0; |
1523 | } | 1521 | } |
1524 | 1522 | ||
@@ -1553,7 +1551,6 @@ pmac_ide_dma_end (ide_drive_t *drive) | |||
1553 | volatile struct dbdma_regs __iomem *dma = pmif->dma_regs; | 1551 | volatile struct dbdma_regs __iomem *dma = pmif->dma_regs; |
1554 | u32 dstat; | 1552 | u32 dstat; |
1555 | 1553 | ||
1556 | drive->waiting_for_dma = 0; | ||
1557 | dstat = readl(&dma->status); | 1554 | dstat = readl(&dma->status); |
1558 | writel(((RUN|WAKE|DEAD) << 16), &dma->control); | 1555 | writel(((RUN|WAKE|DEAD) << 16), &dma->control); |
1559 | 1556 | ||