| Message ID | 20190201084801.10983-3-hch@lst.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [01/18] MIPS: lantiq: pass struct device to DMA API functions | expand |
On 01-02-19, 09:47, Christoph Hellwig wrote: > 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. This looks good to me but fails to apply. Can you please base it on dmaengine-next or linux-next please and resend Thanks
On Sat, Feb 02, 2019 at 03:41:21PM +0530, Vinod Koul wrote: > On 01-02-19, 09:47, Christoph Hellwig wrote: > > 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. > > This looks good to me but fails to apply. Can you please base it on > dmaengine-next or linux-next please and resend commit ceaf52265148d3a5ca24237fd1c709caa5f46184 Author: Andy Duan <fugang.duan@nxp.com> Date: Fri Jan 11 14:29:49 2019 +0000 dmaengine: imx-sdma: pass ->dev to dma_alloc_coherent() API in linux-next actually is equivalent to this patch, so we can drop this one. > > Thanks > -- > ~Vinod ---end quoted text---
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);
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(-)