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

Commit e1fd7341 authored Jun 27, 2013 by Russell King

DMA-API: usb: use new dma_coerce_mask_and_coherent()



Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 22d9d8e8

drivers/usb/chipidea/ci_hdrc_imx.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -121,9 +121,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)

		pdata.phy = data->phy;

		if (!pdev->dev.dma_mask)
		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
		ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
		ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
		if (ret)
		goto err_clk;

drivers/usb/dwc3/dwc3-exynos.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -119,9 +119,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
		* Since shared usb code relies on it, set it here for now.
		* Once we move to full device tree support this will vanish off.
		*/
		if (!dev->dma_mask)
		dev->dma_mask = &dev->coherent_dma_mask;
		ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
		ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
		if (ret)
		goto err1;

drivers/usb/host/ehci-atmel.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -90,9 +90,7 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
		* Since shared usb code relies on it, set it here for now.
		* Once we have dma capability bindings this can go away.
		*/
		if (!pdev->dev.dma_mask)
		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
		retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
		retval = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
		if (retval)
		goto fail_create_hcd;

drivers/usb/host/ehci-omap.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -144,9 +144,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
		* Since shared usb code relies on it, set it here for now.
		* Once we have dma capability bindings this can go away.
		*/
		if (!dev->dma_mask)
		dev->dma_mask = &dev->coherent_dma_mask;
		ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
		ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
		if (ret)
		return ret;

drivers/usb/host/ehci-orion.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -180,9 +180,7 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
		* set. Since shared usb code relies on it, set it here for
		* now. Once we have dma capability bindings this can go away.
		*/
		if (!pdev->dev.dma_mask)
		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
		err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
		err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
		if (err)
		goto err1;