From: Arnaud Mandy <ext-arnaud.2.mandy@xxxxxxxxx> moving use_dma parameter to beginning of the file Signed-off-by: Arnaud Mandy <ext-arnaud.2.mandy@xxxxxxxxx> Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx> --- drivers/usb/musb/musb_core.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 3a61ddb..2838059 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -114,6 +114,13 @@ #define TA_WAIT_BCON(m) max_t(int, (m)->a_wait_bcon, OTG_TIME_A_WAIT_BCON) +#ifndef CONFIG_MUSB_PIO_ONLY +static int __initdata use_dma = 1; +#else +static int __initdata use_dma; +#endif +module_param(use_dma, bool, 0); +MODULE_PARM_DESC(use_dma, "enable/disable use of DMA"); unsigned musb_debug; module_param_named(debug, musb_debug, uint, S_IRUGO | S_IWUSR); @@ -1591,12 +1598,6 @@ irqreturn_t musb_interrupt(struct musb *musb) #ifndef CONFIG_MUSB_PIO_ONLY -static int __initdata use_dma = 1; - -/* "modprobe ... use_dma=0" etc */ -module_param(use_dma, bool, 0); -MODULE_PARM_DESC(use_dma, "enable/disable use of DMA"); - void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit) { u8 devctl = musb_readb(musb->mregs, MUSB_DEVCTL); -- 1.6.4.2.253.g0b1fac -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html