diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-27 14:09:01 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-31 14:48:52 +0000 |
| commit | 224ddca0f2f44986214ee8f9e6e0280bf2016655 (patch) | |
| tree | 6b8bac40ae2d3848541938bd1767189e3e276cb4 /drivers/media/platform/omap3isp/isp.c | |
| parent | DMA-API: dma: dw_dmac.c: convert to use dma_coerce_mask_and_coherent() (diff) | |
| download | linux-dev-224ddca0f2f44986214ee8f9e6e0280bf2016655.tar.xz linux-dev-224ddca0f2f44986214ee8f9e6e0280bf2016655.zip | |
DMA-API: media: omap3isp: use dma_coerce_mask_and_coherent()
The code sequence:
isp->raw_dmamask = DMA_BIT_MASK(32);
isp->dev->dma_mask = &isp->raw_dmamask;
isp->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.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index df3a0ec7fd2c..1c3608039663 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -2182,9 +2182,9 @@ static int isp_probe(struct platform_device *pdev) isp->pdata = pdata; isp->ref_count = 0; - isp->raw_dmamask = DMA_BIT_MASK(32); - isp->dev->dma_mask = &isp->raw_dmamask; - isp->dev->coherent_dma_mask = DMA_BIT_MASK(32); + ret = dma_coerce_mask_and_coherent(isp->dev, DMA_BIT_MASK(32)); + if (ret) + return ret; platform_set_drvdata(pdev, isp); |