|
@@ -1843,10 +1843,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
|
|
|
if (use_dma && dev->dma_mask)
|
|
|
musb->dma_controller = dma_controller_create(musb, musb->mregs);
|
|
|
|
|
|
- /* ideally this would be abstracted in platform setup */
|
|
|
- if (!musb->dma_controller)
|
|
|
- dev->dma_mask = NULL;
|
|
|
-
|
|
|
/* be sure interrupts are disabled before connecting ISR */
|
|
|
musb_platform_disable(musb);
|
|
|
musb_generic_disable(musb);
|
|
@@ -1993,9 +1989,6 @@ static int musb_remove(struct platform_device *pdev)
|
|
|
|
|
|
musb_free(musb);
|
|
|
device_init_wakeup(dev, 0);
|
|
|
-#ifndef CONFIG_MUSB_PIO_ONLY
|
|
|
- dma_set_mask(dev, *dev->parent->dma_mask);
|
|
|
-#endif
|
|
|
return 0;
|
|
|
}
|
|
|
|