Commit 412ade56 authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren

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

Misc cleanup patch.
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6e72f463
...@@ -79,7 +79,7 @@ static int __init tusb_print_revision(struct musb *musb) ...@@ -79,7 +79,7 @@ static int __init tusb_print_revision(struct musb *musb)
return tusb_get_revision(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) | TUSB_PHY_OTG_CTRL_TESTM0)
/* /*
...@@ -89,7 +89,7 @@ static int __init tusb_print_revision(struct musb *musb) ...@@ -89,7 +89,7 @@ static int __init tusb_print_revision(struct musb *musb)
static void tusb_wbus_quirk(struct musb *musb, int enabled) static void tusb_wbus_quirk(struct musb *musb, int enabled)
{ {
void __iomem *tbase = musb->ctrl_base; 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; u32 tmp;
if (enabled) { if (enabled) {
...@@ -477,7 +477,7 @@ done: ...@@ -477,7 +477,7 @@ done:
void musb_platform_try_idle(struct musb *musb, unsigned long timeout) void musb_platform_try_idle(struct musb *musb, unsigned long timeout)
{ {
unsigned long default_timeout = jiffies + msecs_to_jiffies(3); unsigned long default_timeout = jiffies + msecs_to_jiffies(3);
static unsigned long last_timer = 0; static unsigned long last_timer;
if (timeout == 0) if (timeout == 0)
timeout = default_timeout; timeout = default_timeout;
...@@ -920,7 +920,7 @@ static int dma_off; ...@@ -920,7 +920,7 @@ static int dma_off;
* REVISIT: * REVISIT:
* - Check what is unnecessary in MGC_HdrcStart() * - 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; void __iomem *tbase = musb->ctrl_base;
...@@ -956,7 +956,7 @@ void musb_platform_enable(struct musb * musb) ...@@ -956,7 +956,7 @@ void musb_platform_enable(struct musb * musb)
if (is_dma_capable() && dma_off) if (is_dma_capable() && dma_off)
printk(KERN_WARNING "%s %s: dma not reactivated\n", printk(KERN_WARNING "%s %s: dma not reactivated\n",
__FILE__, __FUNCTION__); __FILE__, __func__);
else else
dma_off = 1; dma_off = 1;
} }
...@@ -980,7 +980,7 @@ void musb_platform_disable(struct musb *musb) ...@@ -980,7 +980,7 @@ void musb_platform_disable(struct musb *musb)
if (is_dma_capable() && !dma_off) { if (is_dma_capable() && !dma_off) {
printk(KERN_WARNING "%s %s: dma still active\n", printk(KERN_WARNING "%s %s: dma still active\n",
__FILE__, __FUNCTION__); __FILE__, __func__);
dma_off = 1; dma_off = 1;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment