From: Christoph Hellwig <hch@lst.de>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Ralf Baechle <ralf@linux-mips.org>,
linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] sgiseeq: switch to dma_alloc_attrs
Date: Sat, 26 Aug 2017 09:21:22 +0200 [thread overview]
Message-ID: <20170826072125.9790-2-hch@lst.de> (raw)
In-Reply-To: <20170826072125.9790-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/net/ethernet/seeq/sgiseeq.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index 70347720fdf9..573691bc3b71 100644
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
@@ -737,8 +737,8 @@ static int sgiseeq_probe(struct platform_device *pdev)
sp = netdev_priv(dev);
/* Make private data page aligned */
- sr = dma_alloc_noncoherent(&pdev->dev, sizeof(*sp->srings),
- &sp->srings_dma, GFP_KERNEL);
+ sr = dma_alloc_attrs(&pdev->dev, sizeof(*sp->srings), &sp->srings_dma,
+ GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
if (!sr) {
printk(KERN_ERR "Sgiseeq: Page alloc failed, aborting.\n");
err = -ENOMEM;
@@ -813,8 +813,8 @@ static int sgiseeq_remove(struct platform_device *pdev)
struct sgiseeq_private *sp = netdev_priv(dev);
unregister_netdev(dev);
- dma_free_noncoherent(&pdev->dev, sizeof(*sp->srings), sp->srings,
- sp->srings_dma);
+ dma_free_attrs(&pdev->dev, sizeof(*sp->srings), sp->srings,
+ sp->srings_dma, DMA_ATTR_NON_CONSISTENT);
free_netdev(dev);
return 0;
--
2.11.0
next prev parent reply other threads:[~2017-08-26 7:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-26 7:21 remove dma_alloc_noncoherent V2 Christoph Hellwig
2017-08-26 7:21 ` Christoph Hellwig [this message]
2017-08-26 13:07 ` [PATCH 1/4] sgiseeq: switch to dma_alloc_attrs Ralf Baechle
2017-08-28 22:41 ` David Miller
2017-08-29 8:02 ` Christoph Hellwig
2017-08-26 7:21 ` [PATCH 2/4] au1000_eth: " Christoph Hellwig
2017-08-28 22:42 ` David Miller
2017-08-26 7:21 ` [PATCH 3/4] i825xx: switch to " Christoph Hellwig
2017-08-26 13:10 ` Ralf Baechle
2017-08-28 22:42 ` David Miller
2017-08-26 7:21 ` [PATCH 4/4] dma-mapping: remove dma_alloc_noncoherent and dma_free_noncoherent Christoph Hellwig
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=20170826072125.9790-2-hch@lst.de \
--to=hch@lst.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ralf@linux-mips.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).