Misc cleanup patch. Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx> --- drivers/usb/musb/davinci.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 3477800..acd2aa8 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -29,8 +29,8 @@ #include <linux/list.h> #include <linux/delay.h> #include <linux/clk.h> +#include <linux/io.h> -#include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/memory.h> #include <asm/arch/gpio.h> @@ -38,7 +38,6 @@ #include "musb_core.h" - #ifdef CONFIG_MACH_DAVINCI_EVM #include <asm/arch/i2c-client.h> #endif @@ -93,7 +92,7 @@ void musb_platform_enable(struct musb *musb) if (is_dma_capable() && !dma_off) printk(KERN_WARNING "%s %s: dma not reactivated\n", - __FILE__, __FUNCTION__); + __FILE__, __func__); else dma_off = 0; @@ -446,7 +445,8 @@ int musb_platform_exit(struct musb *musb) break; if ((devctl & MUSB_DEVCTL_VBUS) != warn) { warn = devctl & MUSB_DEVCTL_VBUS; - DBG(1, "VBUS %d\n", warn >> MUSB_DEVCTL_VBUS_SHIFT); + DBG(1, "VBUS %d\n", + warn >> MUSB_DEVCTL_VBUS_SHIFT); } msleep(1000); maxdelay--; -- 1.5.5.23.g2a5fe -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html