Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24353b8b authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 105f4ade

drivers/dma/dw/platform.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -191,11 +191,9 @@ static int dw_probe(struct platform_device *pdev) 
	if (IS_ERR(chip->regs))

	if (IS_ERR(chip->regs))

		return PTR_ERR(chip->regs);

		return PTR_ERR(chip->regs);





	/* Apply default dma_mask if needed */

	err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (!dev->dma_mask) {

	if (err)

		dev->dma_mask = &dev->coherent_dma_mask;

		return err;

		dev->coherent_dma_mask = DMA_BIT_MASK(32);

	}





	pdata = dev_get_platdata(dev);

	pdata = dev_get_platdata(dev);

	if (!pdata)

	if (!pdata)