From: Tony Lindgren <tony@atomide.com>
Date: Thu, 16 Aug 2007 08:40:21 +0000 (-0700)
Subject: musb_hdrc: Search and replace wType with musb_type
X-Git-Tag: v2.6.23-omap1~179
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=615e0c655691a891cbbcba4055aad8ad43f90f0e;p=linux-2.6-omap-h63xx.git

musb_hdrc: Search and replace wType with musb_type

Search and replace wType with musb_type

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 085a1c32f9f..f9077e08f26 100644
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -1244,7 +1244,7 @@ enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTROLLER_HDRC, };
 /* Initialize MUSB (M)HDRC part of the USB hardware subsystem;
  * configure endpoints, or take their config from silicon
  */
-static int __init musb_core_init(u16 wType, struct musb *musb)
+static int __init musb_core_init(u16 musb_type, struct musb *musb)
 {
 #ifdef MUSB_AHB_ID
 	u32 data;
@@ -1306,11 +1306,11 @@ static int __init musb_core_init(u16 wType, struct musb *musb)
 	data = musb_readl(mbase, 0x40c);
 	printk("ID3=%lx\n", (long unsigned)data);
 	reg = musb_readb(mbase, 0x400);
-	wType = ('M' == reg) ? MUSB_CONTROLLER_MHDRC : MUSB_CONTROLLER_HDRC;
+	musb_type = ('M' == reg) ? MUSB_CONTROLLER_MHDRC : MUSB_CONTROLLER_HDRC;
 #else
 	aDate[0] = 0;
 #endif
-	if (MUSB_CONTROLLER_MHDRC == wType) {
+	if (MUSB_CONTROLLER_MHDRC == musb_type) {
 		musb->is_multipoint = 1;
 		type = "M";
 	} else {