diff options
| author | Bartlomiej Zolnierkiewicz | 2008-07-15 21:21:47 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2008-07-15 21:21:47 +0200 |
| commit | 912ef6d94cc07ce5db19a8ed8953676727d4f30c (patch) | |
| tree | 77c34b479796660a015e017552dc2cea908697da /drivers/ide/pci/sgiioc4.c | |
| parent | ide: remove try_to_flush_leftover_data() (diff) | |
| download | kernel-qcow2-linux-912ef6d94cc07ce5db19a8ed8953676727d4f30c.tar.gz kernel-qcow2-linux-912ef6d94cc07ce5db19a8ed8953676727d4f30c.tar.xz kernel-qcow2-linux-912ef6d94cc07ce5db19a8ed8953676727d4f30c.zip | |
sgiioc4: use ->extra_base instead of ->dma_status for dma_handle
This is a preparation for removal of ->dma_status field from ide_hwif_t.
There should be no functional changes caused by this patch.
Acked-by: Jeremy Higdon <jeremy@sgi.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
| -rw-r--r-- | drivers/ide/pci/sgiioc4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 16a0bce17d69..c1b667c53f2b 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c @@ -369,8 +369,7 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d) hwif->sg_max_nents = IOC4_PRD_ENTRIES; pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE, - (dma_addr_t *) &(hwif->dma_status)); - + (dma_addr_t *)&hwif->extra_base); if (pad) { ide_set_hwifdata(hwif, pad); return 0; @@ -439,7 +438,7 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive) /* Address of the Ending DMA */ memset(ide_get_hwifdata(hwif), 0, IOC4_IDE_CACHELINE_SIZE); - ending_dma_addr = cpu_to_le32(hwif->dma_status); + ending_dma_addr = cpu_to_le32(hwif->extra_base); writel(ending_dma_addr, (void __iomem *)(dma_base + IOC4_DMA_END_ADDR * 4)); writel(dma_direction, (void __iomem *)ioc4_dma_addr); |