[PATCH 30/51] DMA-API: dma: dw_dmac.c: convert to use dma_coerce_mask_and_coherent()
From: Russell King <hidden>
Date: 2013-09-19 21:55:02
Also in:
alsa-devel, dri-devel, linux-arm-kernel, linux-crypto, linux-devicetree, linux-fbdev, linux-ide, linux-mmc, linux-nvme, linux-omap, linux-samsung-soc, linux-scsi, linux-tegra, linux-wireless, linuxppc-dev
Subsystem:
dma generic offload engine subsystem, synopsys designware dmac driver, the rest · Maintainers:
Vinod Koul, Viresh Kumar, Linus Torvalds
This code sequence:
if (!pdev->dev.dma_mask) {
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
}
bypasses the architectures check on the DMA mask. It can be replaced
with dma_coerce_mask_and_coherent(), avoiding the direct initialization
of this mask.
Signed-off-by: Russell King <redacted>
---
drivers/dma/dw/platform.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index e35d975..453822c 100644
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c@@ -191,11 +191,9 @@ static int dw_probe(struct platform_device *pdev) if (IS_ERR(chip->regs)) return PTR_ERR(chip->regs); - /* Apply default dma_mask if needed */ - if (!dev->dma_mask) { - dev->dma_mask = &dev->coherent_dma_mask; - dev->coherent_dma_mask = DMA_BIT_MASK(32); - } + err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (err) + return err; pdata = dev_get_platdata(dev); if (!pdata)
--
1.7.4.4