From: Grygorii Strashko Date: Tue, 5 Apr 2016 12:09:44 +0000 (+0300) Subject: UPSTREAM: usb: dwc3: omap: drop dma_mask configuration X-Git-Tag: firefly_0821_release~1864 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=32bd9f56e78b1c1601a587cbc45810efe23a8e26;p=firefly-linux-kernel-4.4.55.git UPSTREAM: usb: dwc3: omap: drop dma_mask configuration The DWC3 OMAP driver supports DT-boot only, as result dma_mask will be always configured properly from DT - of_platform_device_create_pdata()->of_dma_configure(). More over, dwc3-omap.c can be built as module and in this case it's unsafe to assign local variable as dma_mask. Hence, remove dma_mask configuration code. Change-Id: I48f756ccc2d84b0e5eb4afc7b3789261d735600c Signed-off-by: Grygorii Strashko Signed-off-by: Felipe Balbi Signed-off-by: Wu Liang feng (cherry picked from commit 495dd5f78145c44274eeb8ec297195ac71a8fed0) --- diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 55da2c7f727f..f0e5a68b709f 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -331,8 +331,6 @@ static void dwc3_omap_disable_irqs(struct dwc3_omap *omap) dwc3_omap_write_irqmisc_clr(omap, reg); } -static u64 dwc3_omap_dma_mask = DMA_BIT_MASK(32); - static int dwc3_omap_id_notifier(struct notifier_block *nb, unsigned long event, void *ptr) { @@ -490,7 +488,6 @@ static int dwc3_omap_probe(struct platform_device *pdev) omap->irq = irq; omap->base = base; omap->vbus_reg = vbus_reg; - dev->dma_mask = &dwc3_omap_dma_mask; pm_runtime_enable(dev); ret = pm_runtime_get_sync(dev);