]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: mtk-xhci: Do not explicitly set the DMA mask
authorTomasz Figa <tfiga@chromium.org>
Thu, 19 Dec 2019 09:39:54 +0000 (18:39 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Dec 2019 19:11:31 +0000 (20:11 +0100)
The mtk-xhci platform glue sets the DMA mask to 32 bits on its own,
which was needed before commit fda182d80a0b ("usb: xhci: configure
32-bit DMA if the controller does not support 64-bit DMA"), but now it
has no effect, because xhci_gen_setup() sets it up for us according to
hardware capabilities. Remove the useless code.

Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Link: https://lore.kernel.org/r/20191219093954.163417-1-tfiga@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-mtk.c

index b18a6baef204a60b1ac5071a55fdb25b0280aea5..bfbdb3ceed29185edd62bb0db95e00201c69330a 100644 (file)
@@ -488,11 +488,6 @@ static int xhci_mtk_probe(struct platform_device *pdev)
                goto disable_clk;
        }
 
-       /* Initialize dma_mask and coherent_dma_mask to 32-bits */
-       ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
-       if (ret)
-               goto disable_clk;
-
        hcd = usb_create_hcd(driver, dev, dev_name(dev));
        if (!hcd) {
                ret = -ENOMEM;