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

USB: MUSB: checkpatch.pl fixes to tusb6010.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/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 3008b6de14f..bed2e180be0 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -79,7 +79,7 @@ static int __init tusb_print_revision(struct musb *musb)
 	return tusb_get_revision(musb);
 }
 
-#define WBUS_QUIRK_MASK	(TUSB_PHY_OTG_CTRL_TESTM2 | TUSB_PHY_OTG_CTRL_TESTM1	\
+#define WBUS_QUIRK_MASK	(TUSB_PHY_OTG_CTRL_TESTM2 | TUSB_PHY_OTG_CTRL_TESTM1 \
 				| TUSB_PHY_OTG_CTRL_TESTM0)
 
 /*
@@ -89,7 +89,7 @@ static int __init tusb_print_revision(struct musb *musb)
 static void tusb_wbus_quirk(struct musb *musb, int enabled)
 {
 	void __iomem	*tbase = musb->ctrl_base;
-	static u32	phy_otg_ctrl = 0, phy_otg_ena = 0;
+	static u32	phy_otg_ctrl, phy_otg_ena;
 	u32		tmp;
 
 	if (enabled) {
@@ -477,7 +477,7 @@ done:
 void musb_platform_try_idle(struct musb *musb, unsigned long timeout)
 {
 	unsigned long		default_timeout = jiffies + msecs_to_jiffies(3);
-	static unsigned long	last_timer = 0;
+	static unsigned long	last_timer;
 
 	if (timeout == 0)
 		timeout = default_timeout;
@@ -920,7 +920,7 @@ static int dma_off;
  * REVISIT:
  * - Check what is unnecessary in MGC_HdrcStart()
  */
-void musb_platform_enable(struct musb * musb)
+void musb_platform_enable(struct musb *musb)
 {
 	void __iomem	*tbase = musb->ctrl_base;
 
@@ -956,7 +956,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 = 1;
 }
@@ -980,7 +980,7 @@ void musb_platform_disable(struct musb *musb)
 
 	if (is_dma_capable() && !dma_off) {
 		printk(KERN_WARNING "%s %s: dma still active\n",
-				__FILE__, __FUNCTION__);
+				__FILE__, __func__);
 		dma_off = 1;
 	}
 }