Skip to content

Commit

Permalink
DMA-API: staging: use dma_set_coherent_mask()
Browse files Browse the repository at this point in the history
The correct way for a driver to specify the coherent DMA mask is
not to directly access the field in the struct device, but to use
dma_set_coherent_mask().  Only arch and bus code should access this
member directly.

Convert all direct write accesses to using the correct API.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Oct 31, 2013
1 parent e1fd734 commit 4cdbb4f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
5 changes: 3 additions & 2 deletions drivers/staging/dwc2/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ static int dwc2_driver_probe(struct platform_device *dev)
*/
if (!dev->dev.dma_mask)
dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
if (!dev->dev.coherent_dma_mask)
dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
retval = dma_set_coherent_mask(&dev->dev, DMA_BIT_MASK(32));
if (retval)
return retval;

irq = platform_get_irq(dev, 0);
if (irq < 0) {
Expand Down
8 changes: 6 additions & 2 deletions drivers/staging/imx-drm/imx-drm-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,12 @@ static struct drm_driver imx_drm_driver = {

static int imx_drm_platform_probe(struct platform_device *pdev)
{
int ret;

ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
return ret;

imx_drm_device->dev = &pdev->dev;

return drm_platform_init(&imx_drm_driver, pdev);
Expand Down Expand Up @@ -847,8 +853,6 @@ static int __init imx_drm_init(void)
goto err_pdev;
}

imx_drm_pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32),

ret = platform_driver_register(&imx_drm_pdrv);
if (ret)
goto err_pdrv;
Expand Down
4 changes: 3 additions & 1 deletion drivers/staging/imx-drm/ipuv3-crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,9 @@ static int ipu_drm_probe(struct platform_device *pdev)
if (!pdata)
return -EINVAL;

pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
return ret;

ipu_crtc = devm_kzalloc(&pdev->dev, sizeof(*ipu_crtc), GFP_KERNEL);
if (!ipu_crtc)
Expand Down

0 comments on commit 4cdbb4f

Please sign in to comment.