64b53247c4
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 9f617ce19c5dab429a539d411204ae220b5b8cd6 Mon Sep 17 00:00:00 2001
|
|
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Date: Fri, 13 Oct 2017 16:26:33 +0800
|
|
Subject: [PATCH 126/224] 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>
|
|
---
|
|
drivers/usb/host/xhci-mtk.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
--- a/drivers/usb/host/xhci-mtk.c
|
|
+++ b/drivers/usb/host/xhci-mtk.c
|
|
@@ -606,15 +606,10 @@ static int xhci_mtk_probe(struct platfor
|
|
}
|
|
|
|
/* 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;
|