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

musb_hdrc: Search and replace bDelayPortPowerOff with delay_port_power_off

Search and replace bDelayPortPowerOff with delay_port_power_off

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

diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index a8f11c4f59f..17c7cbebcd2 100644
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -451,7 +451,7 @@ struct musb {
 
 #ifdef CONFIG_USB_MUSB_OTG
 	/* FIXME this can't be OTG-specific ... ? */
-	u8 bDelayPortPowerOff;
+	u8 delay_port_power_off;
 #endif
 
 #ifdef MUSB_CONFIG_PROC_FS
diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index f4089f0c11d..b928a76161b 100644
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -557,7 +557,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
 		if (is_peripheral_active(musb)) {
 			// REVISIT HNP; just force disconnect
 		}
-		musb->bDelayPortPowerOff = FALSE;
+		musb->delay_port_power_off = FALSE;
 		musb_writew(mbase, MGC_O_HDRC_INTRTXE, musb->wEndMask);
 		musb_writew(mbase, MGC_O_HDRC_INTRRXE, musb->wEndMask & 0xfffe);
 		musb_writeb(mbase, MGC_O_HDRC_INTRUSBE, 0xf7);
diff --git a/drivers/usb/musb/virthub.c b/drivers/usb/musb/virthub.c
index 89fc5a9eadb..5ad161455b7 100644
--- a/drivers/usb/musb/virthub.c
+++ b/drivers/usb/musb/virthub.c
@@ -116,7 +116,7 @@ static void musb_port_reset(struct musb *musb, u8 bReset)
 	/* REVISIT this looks wrong for HNP */
 	u8 devctl = musb_readb(mbase, MGC_O_HDRC_DEVCTL);
 
-	if (musb->bDelayPortPowerOff || !(devctl & MGC_M_DEVCTL_HM)) {
+	if (musb->delay_port_power_off || !(devctl & MGC_M_DEVCTL_HM)) {
 		return;
 	}
 #endif