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

Commit 22d9d8e8 authored by Russell King's avatar Russell King
Browse files

DMA-API: usb: use dma_set_coherent_mask() 



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.

Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 93b11b25

drivers/usb/chipidea/ci_hdrc_imx.c

+3 −2
Original line number Diff line number Diff line
@@ -123,8 +123,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 


	if (!pdev->dev.dma_mask)

		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;

	if (!pdev->dev.coherent_dma_mask)

		pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

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

	if (ret)

		goto err_clk;



	if (data->usbmisc_data) {

		ret = imx_usbmisc_init(data->usbmisc_data);

drivers/usb/dwc3/dwc3-exynos.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

drivers/usb/gadget/lpc32xx_udc.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

drivers/usb/host/ehci-atmel.c

+3 −2
Original line number Diff line number Diff line
@@ -92,8 +92,9 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev) 
	 */

	if (!pdev->dev.dma_mask)

		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;

	if (!pdev->dev.coherent_dma_mask)

		pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

	retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

	if (retval)

		goto fail_create_hcd;



	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));

	if (!hcd) {

drivers/usb/host/ehci-octeon.c

+3 −1
Original line number Diff line number Diff line
@@ -116,8 +116,10 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev) 
	 * We can DMA from anywhere. But the descriptors must be in

	 * the lower 4GB.

	 */

	pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

	pdev->dev.dma_mask = &ehci_octeon_dma_mask;

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

	if (ret)

		return ret;



	hcd = usb_create_hcd(&ehci_octeon_hc_driver, &pdev->dev, "octeon");

	if (!hcd)