netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: linux-scsi@vger.kernel.org, linux-serial@vger.kernel.org,
	netdev@vger.kernel.org, linux-metag@vger.kernel.org,
	nios2-dev@lists.rocketboards.org, linux-fbdev@vger.kernel.org,
	alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 06/11] sigwd93: switch to dma_alloc_attrs
Date: Fri, 16 Jun 2017 09:17:11 +0200	[thread overview]
Message-ID: <20170616071716.17321-7-hch@lst.de> (raw)
In-Reply-To: <20170616071716.17321-1-hch@lst.de>

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

  parent reply	other threads:[~2017-06-16  7:17 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-16  7:17 remove dma_alloc_noncoherent Christoph Hellwig
2017-06-16  7:17 ` [PATCH 01/11] dma-mapping: remove dmam_free_noncoherent Christoph Hellwig
2017-06-26  7:07   ` Christoph Hellwig
     [not found]     ` <20170626070715.GA12711-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2017-06-26 20:53       ` Tejun Heo
2017-06-16  7:17 ` [PATCH 02/11] dma-mapping: replace dmam_alloc_noncoherent with dmam_alloc_attrs Christoph Hellwig
2017-06-26  7:07   ` Christoph Hellwig
2017-06-26 20:53     ` Tejun Heo
2017-06-16  7:17 ` [PATCH 03/11] au1100fb: remove a bogus dma_free_nonconsistent call Christoph Hellwig
     [not found]   ` <CGME20170619111507epcas5p47fd18b90a02d827da256ff4ebbda8089@epcas5p4.samsung.com>
2017-06-19 11:15     ` Bartlomiej Zolnierkiewicz
2017-06-20  9:10       ` Christoph Hellwig
     [not found]         ` <CGME20170620105805epcas1p4ea41a72356c35f2a16197b970939fb65@epcas1p4.samsung.com>
2017-06-20 10:58           ` Bartlomiej Zolnierkiewicz
2017-06-16  7:17 ` [PATCH 04/11] sound/hal2: switch to dma_alloc_attrs Christoph Hellwig
2017-06-16  8:49   ` [alsa-devel] " Takashi Iwai
     [not found]     ` <s5h1sqkb9l7.wl-tiwai-l3A5Bk7waGM@public.gmane.org>
2017-06-16  8:51       ` Christoph Hellwig
2017-06-16  8:57         ` Takashi Iwai
2017-06-16  7:17 ` [PATCH 05/11] serial/mpsc: " Christoph Hellwig
2017-06-16  7:17 ` Christoph Hellwig [this message]
     [not found]   ` <20170616071716.17321-7-hch-jcswGhMUV9g@public.gmane.org>
2017-06-26 18:20     ` [PATCH 06/11] sigwd93: " Martin K. Petersen
2017-06-16  7:17 ` [PATCH 07/11] 53c700: " Christoph Hellwig
2017-06-26 18:21   ` Martin K. Petersen
2017-06-16  7:17 ` [PATCH 08/11] sgiseeq: " Christoph Hellwig
2017-06-16  7:17 ` [PATCH 09/11] au1000_eth: " Christoph Hellwig
2017-06-16  7:17 ` [PATCH 10/11] i825xx: switch to " Christoph Hellwig
2017-06-16  7:17 ` [PATCH 11/11] dma-mapping: remove dma_alloc_noncoherent and dma_free_noncoherent Christoph Hellwig
2017-06-20 12:44 ` remove dma_alloc_noncoherent David Laight

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170616071716.17321-7-hch@lst.de \
    --to=hch@lst.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-metag@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nios2-dev@lists.rocketboards.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).