hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Russell King 2013-06-27 12:36:37 +01:00
parent 22d9d8e831
commit e1fd734183
17 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/chipidea/ci_hdrc_imx.c
View File

@ -121,9 +121,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
pdata.phy = data->phy; pdata.phy = data->phy;
if (!pdev->dev.dma_mask) ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
if (ret) if (ret)
goto err_clk; goto err_clk;

4
drivers/usb/dwc3/dwc3-exynos.c
View File

@ -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. * Since shared usb code relies on it, set it here for now.
* Once we move to full device tree support this will vanish off. * Once we move to full device tree support this will vanish off.
*/ */
if (!dev->dma_mask) ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
dev->dma_mask = &dev->coherent_dma_mask;
ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
if (ret) if (ret)
goto err1; goto err1;

4
drivers/usb/host/ehci-atmel.c
View File

@ -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. * Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away. * Once we have dma capability bindings this can go away.
*/ */
if (!pdev->dev.dma_mask) retval = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
if (retval) if (retval)
goto fail_create_hcd; goto fail_create_hcd;

4
drivers/usb/host/ehci-omap.c
View File

@ -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. * Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away. * Once we have dma capability bindings this can go away.
*/ */
if (!dev->dma_mask) ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
dev->dma_mask = &dev->coherent_dma_mask;
ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
if (ret) if (ret)
return ret; return ret;

4
drivers/usb/host/ehci-orion.c
View File

@ -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 * set. Since shared usb code relies on it, set it here for
* now. Once we have dma capability bindings this can go away. * now. Once we have dma capability bindings this can go away.
*/ */
if (!pdev->dev.dma_mask) err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
if (err) if (err)
goto err1; goto err1;

5
drivers/usb/host/ehci-platform.c
View File

@ -89,9 +89,8 @@ static int ehci_platform_probe(struct platform_device *dev)
*/ */
if (!dev_get_platdata(&dev->dev)) if (!dev_get_platdata(&dev->dev))
dev->dev.platform_data = &ehci_platform_defaults; dev->dev.platform_data = &ehci_platform_defaults;
if (!dev->dev.dma_mask)
dev->dev.dma_mask = &dev->dev.coherent_dma_mask; err = dma_coerce_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
err = dma_set_coherent_mask(&dev->dev, DMA_BIT_MASK(32));
if (err) if (err)
return err; return err;

4
drivers/usb/host/ehci-s5p.c
View File

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

4
drivers/usb/host/ehci-spear.c
View File

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

4
drivers/usb/host/ehci-tegra.c
View File

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

4
drivers/usb/host/ohci-at91.c
View File

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

4
drivers/usb/host/ohci-exynos.c
View File

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

3
drivers/usb/host/ohci-nxp.c
View File

@ -226,8 +226,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
if (ret) if (ret)
goto fail_disable; goto fail_disable;

3
drivers/usb/host/ohci-octeon.c
View File

@ -127,8 +127,7 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
} }
/* Ohci is a 32-bit device. */ /* Ohci is a 32-bit device. */
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
if (ret) if (ret)
return ret; return ret;

4
drivers/usb/host/ohci-omap3.c
View File

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

4
drivers/usb/host/ohci-pxa27x.c
View File

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

4
drivers/usb/host/ohci-spear.c
View File

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

4
drivers/usb/host/uhci-platform.c
View File

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