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

19 files changed, 64 insertions, 38 deletions

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 74d998d9b45b..bf33bd3e27b1 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -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);
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index 2f2e88a3a11a..c10b3248e047 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 67128be1e1b7..6a2a65aa0057 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;
 
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 3b645ff46f7b..5831a88623e4 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -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) {
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c
index ab0397e4d8f3..4c528b2c033a 100644
--- a/drivers/usb/host/ehci-octeon.c
+++ b/drivers/usb/host/ehci-octeon.c
@@ -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)
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 78b01fa475bb..d0759c5c03ab 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -104,7 +104,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
         struct resource *res;
         struct usb_hcd  *hcd;
         void __iomem *regs;
-        int ret = -ENODEV;
+        int ret;
         int irq;
         int i;
         struct omap_hcd *omap;
@@ -146,9 +146,11 @@ static int ehci_hcd_omap_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)
+                return ret;
 
+        ret = -ENODEV;
         hcd = usb_create_hcd(&ehci_omap_hc_driver, dev,
                         dev_name(dev));
         if (!hcd) {
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index d1dfb9db5b42..58702066a8b7 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -182,8 +182,9 @@ static int ehci_orion_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);
+        err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+        if (err)
+                goto err1;
 
         if (!request_mem_region(res->start, resource_size(res),
                                 ehci_orion_hc_driver.description)) {
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index f6b790ca8cf2..5b0cd2d5f9a6 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -78,7 +78,7 @@ static int ehci_platform_probe(struct platform_device *dev)
         struct resource *res_mem;
         struct usb_ehci_pdata *pdata;
         int irq;
-        int err = -ENOMEM;
+        int err;
 
         if (usb_disabled())
                 return -ENODEV;
@@ -91,8 +91,9 @@ static int ehci_platform_probe(struct platform_device *dev)
                 dev->dev.platform_data = &ehci_platform_defaults;
         if (!dev->dev.dma_mask)
                 dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
-        if (!dev->dev.coherent_dma_mask)
-                dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        err = dma_set_coherent_mask(&dev->dev, DMA_BIT_MASK(32));
+        if (err)
+                return err;
 
         pdata = dev_get_platdata(&dev->dev);
 
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 7c3de95c7054..10d6a2e307e1 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -91,8 +91,9 @@ static int s5p_ehci_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);
+        err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+        if (err)
+                return err;
 
         s5p_setup_vbus_gpio(pdev);
 
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
index 1cf0adba3fc8..6839e1504db5 100644
--- a/drivers/usb/host/ehci-spear.c
+++ b/drivers/usb/host/ehci-spear.c
@@ -83,8 +83,9 @@ static int spear_ehci_hcd_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;
 
         usbh_clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(usbh_clk)) {
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 78fa76da3324..3d9ee43ef2d7 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -364,8 +364,9 @@ static int tegra_ehci_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);
+        err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+        if (err)
+                return err;
 
         hcd = usb_create_hcd(&tegra_ehci_hc_driver, &pdev->dev,
                                         dev_name(&pdev->dev));
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index caa3764a3407..eb7a2cb26419 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -524,7 +524,7 @@ MODULE_DEVICE_TABLE(of, at91_ohci_dt_ids);
 static int ohci_at91_of_init(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
-        int i, gpio;
+        int i, gpio, ret;
         enum of_gpio_flags flags;
         struct at91_usbh_data   *pdata;
         u32 ports;
@@ -538,8 +538,9 @@ static int ohci_at91_of_init(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)
+                return ret;
 
         pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index dc6ee9adacf5..ed685cbd5892 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -116,8 +116,9 @@ static int exynos_ohci_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);
+        err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+        if (err)
+                return err;
 
         exynos_ohci = devm_kzalloc(&pdev->dev, sizeof(struct exynos_ohci_hcd),
                                         GFP_KERNEL);
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index 7d7d507d54e8..5f82db409d65 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -226,8 +226,10 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
                 return -EPROBE_DEFER;
         }
 
-        pdev->dev.coherent_dma_mask = 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)
+                goto fail_disable;
 
         dev_dbg(&pdev->dev, "%s: " DRIVER_DESC " (nxp)\n", hcd_name);
         if (usb_disabled()) {
diff --git a/drivers/usb/host/ohci-octeon.c b/drivers/usb/host/ohci-octeon.c
index 342dc7e543b8..ac1dea12a1a7 100644
--- a/drivers/usb/host/ohci-octeon.c
+++ b/drivers/usb/host/ohci-octeon.c
@@ -127,8 +127,10 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
         }
 
         /* Ohci is a 32-bit device. */
-        pdev->dev.coherent_dma_mask = 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)
+                return ret;
 
         hcd = usb_create_hcd(&ohci_octeon_hc_driver, &pdev->dev, "octeon");
         if (!hcd)
diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c
index a09af26f69ed..664f5dc40939 100644
--- a/drivers/usb/host/ohci-omap3.c
+++ b/drivers/usb/host/ohci-omap3.c
@@ -132,7 +132,7 @@ static int ohci_hcd_omap3_probe(struct platform_device *pdev)
         struct usb_hcd          *hcd = NULL;
         void __iomem            *regs = NULL;
         struct resource         *res;
-        int                     ret = -ENODEV;
+        int                     ret;
         int                     irq;
 
         if (usb_disabled())
@@ -168,9 +168,11 @@ static int ohci_hcd_omap3_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 err_io;
 
+        ret = -ENODEV;
         hcd = usb_create_hcd(&ohci_omap3_hc_driver, dev,
                         dev_name(dev));
         if (!hcd) {
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 93371a235e82..74696ae29aa6 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -287,6 +287,7 @@ static int ohci_pxa_of_init(struct platform_device *pdev)
         struct device_node *np = pdev->dev.of_node;
         struct pxaohci_platform_data *pdata;
         u32 tmp;
+        int ret;
 
         if (!np)
                 return 0;
@@ -297,8 +298,9 @@ static int ohci_pxa_of_init(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)
+                return ret;
 
         pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c
index cc9dd9e4f05e..195a0a121107 100644
--- a/drivers/usb/host/ohci-spear.c
+++ b/drivers/usb/host/ohci-spear.c
@@ -113,8 +113,9 @@ static int spear_ohci_hcd_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;
 
         usbh_clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(usbh_clk)) {
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
index d033a0ec7f0d..048912d4819c 100644
--- a/drivers/usb/host/uhci-platform.c
+++ b/drivers/usb/host/uhci-platform.c
@@ -77,8 +77,9 @@ static int uhci_hcd_platform_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)
+                return ret;
 
         hcd = usb_create_hcd(&uhci_platform_hc_driver, &pdev->dev,
                         pdev->name);