DMA-API: usb: use new dma_coerce_mask_and_coherent()

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-platform.c

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 5b0cd2d5f9a67b3dfda42a22ec99b780a957fb5f..7f30b7168d5a53542cdbea786d9cba849a932579 100644 (file)
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -89,9 +89,8 @@ static int ehci_platform_probe(struct platform_device *dev)
         */
        if (!dev_get_platdata(&dev->dev))
                dev->dev.platform_data = &ehci_platform_defaults;
-       if (!dev->dev.dma_mask)
-               dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
-       err = dma_set_coherent_mask(&dev->dev, DMA_BIT_MASK(32));
+
+       err = dma_coerce_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
        if (err)
                return err;