netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: John Crispin <john@phrozen.org>, Vinod Koul <vkoul@kernel.org>,
	Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>,
	Nicolas Ferre <nicolas.ferre@microchip.com>,
	Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
	Felipe Balbi <balbi@kernel.org>,
	linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
	dmaengine@vger.kernel.org, netdev@vger.kernel.org,
	linux-usb@vger.kernel.org, linux-fbdev@vger.kernel.org,
	alsa-devel@alsa-project.org
Cc: iommu@lists.linux-foundation.org
Subject: [PATCH 02/18] dmaengine: imx-sdma: pass struct device to DMA API functions
Date: Fri,  1 Feb 2019 09:47:45 +0100	[thread overview]
Message-ID: <20190201084801.10983-3-hch@lst.de> (raw)
In-Reply-To: <20190201084801.10983-1-hch@lst.de>

The DMA API generally relies on a struct device to work properly, and
only barely works without one for legacy reasons.  Pass the easily
available struct device from the platform_device to remedy this.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/dma/imx-sdma.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 86708fb9bda1..0b6bba0b9f38 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -677,7 +677,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
 	int ret;
 	unsigned long flags;
 
-	buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL);
+	buf_virt = dma_alloc_coherent(sdma->dev, size, &buf_phys, GFP_KERNEL);
 	if (!buf_virt) {
 		return -ENOMEM;
 	}
@@ -696,7 +696,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
 
 	spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
 
-	dma_free_coherent(NULL, size, buf_virt, buf_phys);
+	dma_free_coherent(sdma->dev, size, buf_virt, buf_phys);
 
 	return ret;
 }
@@ -1182,8 +1182,8 @@ static int sdma_request_channel0(struct sdma_engine *sdma)
 {
 	int ret = -EBUSY;
 
-	sdma->bd0 = dma_alloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys,
-				       GFP_NOWAIT);
+	sdma->bd0 = dma_alloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
+					GFP_NOWAIT);
 	if (!sdma->bd0) {
 		ret = -ENOMEM;
 		goto out;
@@ -1842,7 +1842,7 @@ static int sdma_init(struct sdma_engine *sdma)
 	/* Be sure SDMA has not started yet */
 	writel_relaxed(0, sdma->regs + SDMA_H_C0PTR);
 
-	sdma->channel_control = dma_alloc_coherent(NULL,
+	sdma->channel_control = dma_alloc_coherent(sdma->dev,
 			MAX_DMA_CHANNELS * sizeof (struct sdma_channel_control) +
 			sizeof(struct sdma_context_data),
 			&ccb_phys, GFP_KERNEL);
-- 
2.20.1


  parent reply	other threads:[~2019-02-01  8:48 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-01  8:47 don't pass a NULL struct device to DMA API functions Christoph Hellwig
2019-02-01  8:47 ` [PATCH 01/18] MIPS: lantiq: pass " Christoph Hellwig
2019-02-07 23:29   ` Paul Burton
2019-02-12  7:45     ` Christoph Hellwig
2019-02-12 17:41   ` Paul Burton
2019-02-01  8:47 ` Christoph Hellwig [this message]
2019-02-02 10:11   ` [PATCH 02/18] dmaengine: imx-sdma: " Vinod Koul
2019-02-02 17:21     ` Christoph Hellwig
2019-02-01  8:47 ` [PATCH 03/18] net: caif: " Christoph Hellwig
2019-02-01 13:53   ` Robin Murphy
2019-02-01 16:10     ` Christoph Hellwig
2019-02-01  8:47 ` [PATCH 04/18] au1000_eth: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 05/18] macb_main: " Christoph Hellwig
2019-02-01 13:34   ` Nicolas.Ferre
2019-02-01  8:47 ` [PATCH 06/18] lantiq_etop: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 07/18] pxa168_eth: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 08/18] moxart_ether: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 09/18] meth: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 10/18] smc911x: " Christoph Hellwig
2019-02-01 14:14   ` Robin Murphy
2019-02-01 16:11     ` Christoph Hellwig
2019-02-01  8:47 ` [PATCH 11/18] parport_ip32: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 12/18] fotg210-udc: remove a bogus dma_sync_single_for_device call Christoph Hellwig
2019-02-01 13:19   ` Felipe Balbi
2019-02-01 16:10     ` Christoph Hellwig
2019-02-11 13:12       ` Christoph Hellwig
2019-02-11 13:30         ` Felipe Balbi
2019-02-01  8:47 ` [PATCH 13/18] fotg210-udc: pass struct device to DMA API functions Christoph Hellwig
2019-02-01 13:20   ` Felipe Balbi
2019-02-01  8:47 ` [PATCH 14/18] da8xx-fb: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 15/18] gbefb: switch to managed version of the DMA allocator Christoph Hellwig
2019-02-01  8:47 ` [PATCH 16/18] pxa3xx-gcu: pass struct device to dma_mmap_coherent Christoph Hellwig
2019-02-01  8:48 ` [PATCH 17/18] ALSA: hal2: pass struct device to DMA API functions Christoph Hellwig
2019-02-01 13:12   ` [alsa-devel] " Takashi Iwai
2019-02-01 16:09     ` Christoph Hellwig
2019-02-01 16:17       ` Takashi Iwai
2019-02-01  8:48 ` [PATCH 18/18] ALSA: " Christoph Hellwig
2019-02-01 13:13   ` [alsa-devel] " Takashi Iwai
2019-02-01 13:16 ` [alsa-devel] don't pass a NULL " Takashi Iwai
2019-02-01 16:09   ` Christoph Hellwig
2019-02-01 16:18     ` Takashi Iwai

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=20190201084801.10983-3-hch@lst.de \
    --to=hch@lst.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=balbi@kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=dmitry.tarnyagin@lockless.no \
    --cc=iommu@lists.linux-foundation.org \
    --cc=john@phrozen.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nicolas.ferre@microchip.com \
    --cc=sudipm.mukherjee@gmail.com \
    --cc=vkoul@kernel.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).