diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2009-04-08 14:12:49 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-04-08 14:12:49 +0200 |
| commit | 253275c52c8f5848df63f140977ef19800f2dfca (patch) | |
| tree | b770446fe6b5c6b58d7f6b93c41e4cd0c7c73afe | |
| parent | edafcf73dca2f9531c78eec130df84a8c9654b3b (diff) | |
| download | linux-stable-253275c52c8f5848df63f140977ef19800f2dfca.tar.gz linux-stable-253275c52c8f5848df63f140977ef19800f2dfca.tar.bz2 linux-stable-253275c52c8f5848df63f140977ef19800f2dfca.zip | |
tx4939ide: remove wmb()
* define CHECK_DMA_MASK
* remove use of wmb()
Reported-by: Grant Grundler <grundler@google.com>
Reviewed-by: Grant Grundler <grundler@google.com>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
| -rw-r--r-- | drivers/ide/tx4939ide.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 0040a9a3e26e..2e27fcd41864 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c @@ -327,15 +327,15 @@ static int tx4939ide_dma_end(ide_drive_t *drive) /* read and clear the INTR & ERROR bits */ dma_stat = tx4939ide_clear_dma_status(base); - wmb(); +#define CHECK_DMA_MASK (ATA_DMA_ACTIVE | ATA_DMA_ERR | ATA_DMA_INTR) /* verify good DMA status */ - if ((dma_stat & (ATA_DMA_INTR | ATA_DMA_ERR | ATA_DMA_ACTIVE)) == 0 && + if ((dma_stat & CHECK_DMA_MASK) == 0 && (ctl & (TX4939IDE_INT_XFEREND | TX4939IDE_INT_HOST)) == (TX4939IDE_INT_XFEREND | TX4939IDE_INT_HOST)) /* INT_IDE lost... bug? */ return 0; - return ((dma_stat & (ATA_DMA_INTR | ATA_DMA_ERR | ATA_DMA_ACTIVE)) != + return ((dma_stat & CHECK_DMA_MASK) != ATA_DMA_INTR) ? 0x10 | dma_stat : 0; } |