mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
sgiwd93: convert to dma_alloc_noncoherent
Use the new non-coherent DMA API including proper ownership transfers. This also means we can allocate the memory as DMA_TO_DEVICE instead of bidirectional. Signed-off-by: Christoph Hellwig <hch@lst.de> Tested-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
parent
0d71675f87
commit
bd9b848557
@ -95,7 +95,7 @@ void fill_hpc_entries(struct ip22_hostdata *hd, struct scsi_cmnd *cmd, int din)
|
||||
*/
|
||||
hcp->desc.pbuf = 0;
|
||||
hcp->desc.cntinfo = HPCDMA_EOX;
|
||||
dma_cache_sync(hd->dev, hd->cpu,
|
||||
dma_sync_single_for_device(hd->dev, hd->dma,
|
||||
(unsigned long)(hcp + 1) - (unsigned long)hd->cpu,
|
||||
DMA_TO_DEVICE);
|
||||
}
|
||||
@ -234,8 +234,8 @@ static int sgiwd93_probe(struct platform_device *pdev)
|
||||
|
||||
hdata = host_to_hostdata(host);
|
||||
hdata->dev = &pdev->dev;
|
||||
hdata->cpu = dma_alloc_attrs(&pdev->dev, HPC_DMA_SIZE, &hdata->dma,
|
||||
GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
|
||||
hdata->cpu = dma_alloc_noncoherent(&pdev->dev, HPC_DMA_SIZE,
|
||||
&hdata->dma, DMA_TO_DEVICE, GFP_KERNEL);
|
||||
if (!hdata->cpu) {
|
||||
printk(KERN_WARNING "sgiwd93: Could not allocate memory for "
|
||||
"host %d buffer.\n", unit);
|
||||
@ -274,8 +274,8 @@ static int sgiwd93_probe(struct platform_device *pdev)
|
||||
out_irq:
|
||||
free_irq(irq, host);
|
||||
out_free:
|
||||
dma_free_attrs(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma,
|
||||
DMA_ATTR_NON_CONSISTENT);
|
||||
dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma,
|
||||
DMA_TO_DEVICE);
|
||||
out_put:
|
||||
scsi_host_put(host);
|
||||
out:
|
||||
@ -291,8 +291,8 @@ static int sgiwd93_remove(struct platform_device *pdev)
|
||||
|
||||
scsi_remove_host(host);
|
||||
free_irq(pd->irq, host);
|
||||
dma_free_attrs(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma,
|
||||
DMA_ATTR_NON_CONSISTENT);
|
||||
dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma,
|
||||
DMA_TO_DEVICE);
|
||||
scsi_host_put(host);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user