mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-19 21:21:09 +00:00
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>
This commit is contained in:
parent
57279a7a40
commit
912ef6d94c
1 changed files with 2 additions and 3 deletions
|
@ -369,8 +369,7 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
|
||||||
hwif->sg_max_nents = IOC4_PRD_ENTRIES;
|
hwif->sg_max_nents = IOC4_PRD_ENTRIES;
|
||||||
|
|
||||||
pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE,
|
pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE,
|
||||||
(dma_addr_t *) &(hwif->dma_status));
|
(dma_addr_t *)&hwif->extra_base);
|
||||||
|
|
||||||
if (pad) {
|
if (pad) {
|
||||||
ide_set_hwifdata(hwif, pad);
|
ide_set_hwifdata(hwif, pad);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -439,7 +438,7 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
|
||||||
|
|
||||||
/* Address of the Ending DMA */
|
/* Address of the Ending DMA */
|
||||||
memset(ide_get_hwifdata(hwif), 0, IOC4_IDE_CACHELINE_SIZE);
|
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(ending_dma_addr, (void __iomem *)(dma_base + IOC4_DMA_END_ADDR * 4));
|
||||||
|
|
||||||
writel(dma_direction, (void __iomem *)ioc4_dma_addr);
|
writel(dma_direction, (void __iomem *)ioc4_dma_addr);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue