diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 17:44:42 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 17:44:42 -0400 |
commit | 55224bc86a39409d55e47fd45573642ac709bb8f (patch) | |
tree | 979fd9840607e4bca7a62347224d9b8207fb66e3 /drivers/ide/ide-dma.c | |
parent | 41051a141dcc67f4c5011a2ab2b547e80b9ac509 (diff) |
ide: remove ->dma_prdtable field from ide_hwif_t
* Use 'hwif->dma_base + {4,8}' instead of hwif->dma_prdtable in
{ide,scc}_dma_setup().
* Remove no longer needed ->dma_prdtable field from ide_hwif_t.
While at it:
* Use ATA_DMA_TABLE_OFS define.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 767820db7cae..653b1ade13d3 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -464,9 +464,10 @@ int ide_dma_setup(ide_drive_t *drive) | |||
464 | 464 | ||
465 | /* PRD table */ | 465 | /* PRD table */ |
466 | if (hwif->mmio) | 466 | if (hwif->mmio) |
467 | writel(hwif->dmatable_dma, (void __iomem *)hwif->dma_prdtable); | 467 | writel(hwif->dmatable_dma, |
468 | (void __iomem *)(hwif->dma_base + ATA_DMA_TABLE_OFS)); | ||
468 | else | 469 | else |
469 | outl(hwif->dmatable_dma, hwif->dma_prdtable); | 470 | outl(hwif->dmatable_dma, hwif->dma_base + ATA_DMA_TABLE_OFS); |
470 | 471 | ||
471 | /* specify r/w */ | 472 | /* specify r/w */ |
472 | hwif->OUTB(reading, hwif->dma_command); | 473 | hwif->OUTB(reading, hwif->dma_command); |
@@ -860,8 +861,6 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) | |||
860 | hwif->dma_command = hwif->dma_base + 0; | 861 | hwif->dma_command = hwif->dma_base + 0; |
861 | if (!hwif->dma_status) | 862 | if (!hwif->dma_status) |
862 | hwif->dma_status = hwif->dma_base + 2; | 863 | hwif->dma_status = hwif->dma_base + 2; |
863 | if (!hwif->dma_prdtable) | ||
864 | hwif->dma_prdtable = hwif->dma_base + 4; | ||
865 | 864 | ||
866 | hwif->dma_ops = &sff_dma_ops; | 865 | hwif->dma_ops = &sff_dma_ops; |
867 | } | 866 | } |