summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-omap.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-27 12:36:37 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-31 14:49:04 +0000
commite1fd7341837238c6c5380c5073887d238f706cf0 (patch)
tree16828e0c17a48b42cf0cf2bd219cdf068601f7bd /drivers/usb/host/ehci-omap.c
parent22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b (diff)
downloadop-kernel-dev-e1fd7341837238c6c5380c5073887d238f706cf0.zip
op-kernel-dev-e1fd7341837238c6c5380c5073887d238f706cf0.tar.gz
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>
Diffstat (limited to 'drivers/usb/host/ehci-omap.c')
-rw-r--r--drivers/usb/host/ehci-omap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index d0759c5..6fa82d6 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -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;
OpenPOWER on IntegriCloud