From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 08/11] sgiseeq: switch to dma_alloc_attrs Date: Fri, 16 Jun 2017 09:17:13 +0200 Message-ID: <20170616071716.17321-9-hch@lst.de> References: <20170616071716.17321-1-hch@lst.de> Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WuzhwYAEV+8+izyOEpxnIwVoH5z5tvTOort/hVXjUc4=; b=boDjz+PY1cu4YV3GlTLaKsTJb e3dzm17z3e5IIMqE2z0aQ/+9MNC/I6QUfnvA079sX6YXSu60x0zTLwC14McfbPNM1ME7yoP7bmJHP mMxBpcggztl855Sqyaz8ud+IKgpw7BjW+3aT3ubak5wuAeAsUMnBJeIhjva5/Siwc2iFij/7tMAjI 5zO89xLymwEbtxef1O7JphNgrZI+VEArRe7GK6DKDMF+qfcGhoGdzMZhyxNQjPJut8rIYZ4cHdRWt oKCNiYno+C1tp0Em/PwCHHtbFjPNbnc/j8IPdLbzpU6qHiUg0bjzFqmFpD9Gm5k2q4wI99gW6/HYV In-Reply-To: <20170616071716.17321-1-hch@lst.de> Sender: netdev-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper. Signed-off-by: Christoph Hellwig --- 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