Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 912ef6d9 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarJeremy Higdon <jeremy@sgi.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 57279a7a

drivers/ide/pci/sgiioc4.c

+2 −3
Original line number Diff line number Diff line
@@ -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);