Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1667489
| From | Christoph Hellwig <hch@lst.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 06/11] sigwd93: switch to dma_alloc_attrs |
| Date | 2017-06-16 09:30 +0200 |
| Message-ID | <tSTRE-5pn-15@gated-at.bofh.it> (permalink) |
| References | <tSTHX-5l6-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/scsi/sgiwd93.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 71b4b91d2215..80cfa93e407c 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -249,8 +249,8 @@ static int sgiwd93_probe(struct platform_device *pdev)
hdata = host_to_hostdata(host);
hdata->dev = &pdev->dev;
- hdata->cpu = dma_alloc_noncoherent(&pdev->dev, HPC_DMA_SIZE,
- &hdata->dma, GFP_KERNEL);
+ hdata->cpu = dma_alloc_attrs(&pdev->dev, HPC_DMA_SIZE, &hdata->dma,
+ GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
if (!hdata->cpu) {
printk(KERN_WARNING "sgiwd93: Could not allocate memory for "
"host %d buffer.\n", unit);
@@ -289,7 +289,8 @@ static int sgiwd93_probe(struct platform_device *pdev)
out_irq:
free_irq(irq, host);
out_free:
- dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma);
+ dma_free_attrs(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma,
+ DMA_ATTR_NON_CONSISTENT);
out_put:
scsi_host_put(host);
out:
@@ -305,7 +306,8 @@ static int sgiwd93_remove(struct platform_device *pdev)
scsi_remove_host(host);
free_irq(pd->irq, host);
- dma_free_noncoherent(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma);
+ dma_free_attrs(&pdev->dev, HPC_DMA_SIZE, hdata->cpu, hdata->dma,
+ DMA_ATTR_NON_CONSISTENT);
scsi_host_put(host);
return 0;
}
--
2.11.0
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
remove dma_alloc_noncoherent Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
[PATCH 08/11] sgiseeq: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
[PATCH 11/11] dma-mapping: remove dma_alloc_noncoherent and dma_free_noncoherent Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
[PATCH 02/11] dma-mapping: replace dmam_alloc_noncoherent with dmam_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
[PATCH 04/11] sound/hal2: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
Re: [alsa-devel] [PATCH 04/11] sound/hal2: switch to dma_alloc_attrs Takashi Iwai <tiwai@suse.de> - 2017-06-16 11:00 +0200
Re: [alsa-devel] [PATCH 04/11] sound/hal2: switch to dma_alloc_attrs Takashi Iwai <tiwai@suse.de> - 2017-06-16 11:00 +0200
Re: [alsa-devel] [PATCH 04/11] sound/hal2: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 11:00 +0200
[PATCH 10/11] i825xx: switch to switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
[PATCH 05/11] serial/mpsc: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:30 +0200
[PATCH 03/11] au1100fb: remove a bogus dma_free_nonconsistent call Christoph Hellwig <hch@lst.de> - 2017-06-16 09:30 +0200
Re: [PATCH 03/11] au1100fb: remove a bogus dma_free_nonconsistent call Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> - 2017-06-19 13:20 +0200
[PATCH 01/11] dma-mapping: remove dmam_free_noncoherent Christoph Hellwig <hch@lst.de> - 2017-06-16 09:30 +0200
[PATCH 06/11] sigwd93: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:30 +0200
csiph-web