summaryrefslogtreecommitdiffstats
path: root/drivers/dma/dw
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-27 13:37:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-31 14:48:51 +0000
commit24353b8bb4ecfc7f751019ee599c89d5175e12a1 (patch)
tree74288ff09a55423c5ee30c6ec22d438254fe82c3 /drivers/dma/dw
parent105f4ade6fa0fc41742c83fc929e7fdc5a095233 (diff)
downloadlinux-24353b8bb4ecfc7f751019ee599c89d5175e12a1.tar.bz2
DMA-API: dma: dw_dmac.c: convert to use dma_coerce_mask_and_coherent()
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 <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/dma/dw')
-rw-r--r--drivers/dma/dw/platform.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index e35d97590311..453822cc4f9d 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)