From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Fri, 11 Apr 2008 08:28:21 +0000 (+0300)
Subject: USB: MUSB: checkpatch.pl fixes to davinci.c
X-Git-Tag: v2.6.25-omap1~48
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=fc7b5255d3de4d96a3ce4acaeda25e52a7a1248d;p=linux-2.6-omap-h63xx.git

USB: MUSB: checkpatch.pl fixes to davinci.c

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 3477800e3d4..acd2aa8b8bc 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--;