From: Tony Lindgren <tony@atomide.com>
Date: Mon, 13 Aug 2007 11:21:42 +0000 (-0700)
Subject: musb_hdrc: Search and replace bIgnoreDisconnect with ignore_disconnect
X-Git-Tag: v2.6.23-omap1~228^2~24
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2f632717032dd3a83b7f8c957ac1548f57a03aa1;p=linux-2.6-omap-h63xx.git

musb_hdrc: Search and replace bIgnoreDisconnect with ignore_disconnect

Search and replace bIgnoreDisconnect with ignore_disconnect

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

diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index 14fa1b844b9..d9010b2b5ad 100644
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -397,7 +397,7 @@ struct musb {
 
 	unsigned is_multipoint:1;
 	unsigned is_host:1;
-	unsigned bIgnoreDisconnect:1;	/* during bus resets */
+	unsigned ignore_disconnect:1;	/* during bus resets */
 
 	int			a_wait_bcon;	/* VBUS timeout in msecs */
 	unsigned long		idle_timeout;	/* Next timeout in jiffies */
diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index a432a4e21ca..9ffbfe1e1e2 100644
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -690,7 +690,7 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB,
 	}
 #endif
 
-	if ((bIntrUSB & MGC_M_INTR_DISCONNECT) && !musb->bIgnoreDisconnect) {
+	if ((bIntrUSB & MGC_M_INTR_DISCONNECT) && !musb->ignore_disconnect) {
 		DBG(1, "DISCONNECT (%s) as %s, devctl %02x\n",
 				otg_state_string(musb),
 				MUSB_MODE(musb), devctl);
diff --git a/drivers/usb/musb/virthub.c b/drivers/usb/musb/virthub.c
index bebbaa1e288..89fc5a9eadb 100644
--- a/drivers/usb/musb/virthub.c
+++ b/drivers/usb/musb/virthub.c
@@ -145,7 +145,7 @@ static void musb_port_reset(struct musb *musb, u8 bReset)
 			msleep(1);
 		}
 
-		musb->bIgnoreDisconnect = TRUE;
+		musb->ignore_disconnect = TRUE;
 		power &= 0xf0;
 		musb_writeb(mbase, MGC_O_HDRC_POWER,
 				power | MGC_M_POWER_RESET);
@@ -158,7 +158,7 @@ static void musb_port_reset(struct musb *musb, u8 bReset)
 		musb_writeb(mbase, MGC_O_HDRC_POWER,
 				power & ~MGC_M_POWER_RESET);
 
-		musb->bIgnoreDisconnect = FALSE;
+		musb->ignore_disconnect = FALSE;
 
 		power = musb_readb(mbase, MGC_O_HDRC_POWER);
 		if (power & MGC_M_POWER_HSMODE) {