usb: xhci-mtk: use dma_set_mask_and_coherent() in probe function

This patch uses the simpler dma_set_mask_and_coherent() instead of
doing these as separate steps

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 8fb6065..c197a6d 100644 (file)
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -606,15 +606,10 @@ static int xhci_mtk_probe(struct platform_device *pdev)
        }
 
        /* Initialize dma_mask and coherent_dma_mask to 32-bits */
-       ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+       ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
        if (ret)
                goto disable_clk;
 
-       if (!dev->dma_mask)
-               dev->dma_mask = &dev->coherent_dma_mask;
-       else
-               dma_set_mask(dev, DMA_BIT_MASK(32));
-
        hcd = usb_create_hcd(driver, dev, dev_name(dev));
        if (!hcd) {
                ret = -ENOMEM;