diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-27 12:36:37 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-31 14:49:04 +0000 |
| commit | e1fd7341837238c6c5380c5073887d238f706cf0 (patch) | |
| tree | 16828e0c17a48b42cf0cf2bd219cdf068601f7bd /drivers/usb/host/uhci-platform.c | |
| parent | DMA-API: usb: use dma_set_coherent_mask() (diff) | |
| download | linux-dev-e1fd7341837238c6c5380c5073887d238f706cf0.tar.xz linux-dev-e1fd7341837238c6c5380c5073887d238f706cf0.zip | |
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/uhci-platform.c')
| -rw-r--r-- | drivers/usb/host/uhci-platform.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c index 048912d4819c..f8548b72f708 100644 --- a/drivers/usb/host/uhci-platform.c +++ b/drivers/usb/host/uhci-platform.c @@ -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. * Once we have dma capability bindings this can go away. */ - 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) return ret; |