Re: [PATCH 36/51] DMA-API: usb: use dma_set_coherent_mask()
From: Felipe Balbi <hidden>
Date: 2013-09-20 13:08:53
Also in:
alsa-devel, dri-devel, linux-arm-kernel, linux-crypto, linux-devicetree, linux-ide, linux-mmc, linux-omap, linux-samsung-soc, linux-scsi, linux-tegra, linuxppc-dev
Hi, On Thu, Sep 19, 2013 at 11:01:03PM +0100, Russell King wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c index 2f2e88a..c10b324 100644 --- a/drivers/usb/dwc3/dwc3-exynos.c +++ b/drivers/usb/dwc3/dwc3-exynos.c@@ -121,8 +121,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev) */ if (!dev->dma_mask) dev->dma_mask = &dev->coherent_dma_mask; - if (!dev->coherent_dma_mask) - dev->coherent_dma_mask = DMA_BIT_MASK(32); + ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); + if (ret) + goto err1; platform_set_drvdata(pdev, exynos);diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c index 67128be..6a2a65a 100644 --- a/drivers/usb/gadget/lpc32xx_udc.c +++ b/drivers/usb/gadget/lpc32xx_udc.c@@ -3078,7 +3078,9 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev) udc->isp1301_i2c_client->addr); pdev->dev.dma_mask = &lpc32xx_usbd_dmamask; - pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); + retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); + if (retval) + goto resource_fail; udc->board = &lpc32xx_usbddata;
for dwc3 and drivers/usb/gadget: Acked-by: Felipe Balbi <redacted> pretty cool work :-) -- balbi