From: Tony Lindgren Date: Mon, 13 Aug 2007 11:20:42 +0000 (-0700) Subject: musb_hdrc: Search and replace bIsMultipoint with is_multipoint X-Git-Tag: v2.6.23-omap1~228^2~25 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=90129a4741c25dedc527ecf25fb3784d6fb0a6a7;p=linux-2.6-omap-h63xx.git musb_hdrc: Search and replace bIsMultipoint with is_multipoint Search and replace bIsMultipoint with is_multipoint Signed-off-by: Tony Lindgren --- diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 3ec7fb97523..493b11c0b81 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -599,7 +599,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep) } /* target addr and (for multipoint) hub addr/port */ - if (musb->bIsMultipoint) { + if (musb->is_multipoint) { musb_writeb(ep->target_regs, MGC_O_HDRC_RXFUNCADDR, qh->addr_reg); musb_writeb(ep->target_regs, MGC_O_HDRC_RXHUBADDR, @@ -720,7 +720,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, } /* target addr and (for multipoint) hub addr/port */ - if (musb->bIsMultipoint) { + if (musb->is_multipoint) { musb_writeb(mbase, MGC_BUSCTL_OFFSET(epnum, MGC_O_HDRC_TXFUNCADDR), qh->addr_reg); @@ -748,7 +748,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, musb_writeb(epio, MGC_O_HDRC_TXINTERVAL, qh->intv_reg); } else { musb_writeb(epio, MGC_O_HDRC_NAKLIMIT0, qh->intv_reg); - if (musb->bIsMultipoint) + if (musb->is_multipoint) musb_writeb(epio, MGC_O_HDRC_TYPE0, qh->type_reg); } @@ -1850,7 +1850,7 @@ static int musb_urb_enqueue( qh->intv_reg = interval; /* precompute addressing for external hub/tt ports */ - if (musb->bIsMultipoint) { + if (musb->is_multipoint) { struct usb_device *parent = urb->dev->parent; if (parent != hcd->self.root_hub) { diff --git a/drivers/usb/musb/musb_procfs.c b/drivers/usb/musb/musb_procfs.c index a0a4829ad86..694719494bd 100644 --- a/drivers/usb/musb/musb_procfs.c +++ b/drivers/usb/musb/musb_procfs.c @@ -490,7 +490,7 @@ static int dump_header_stats(struct musb *musb, char *buffer) *buffer = 0; count = sprintf(buffer, "Status: %sHDRC, Mode=%s " "(Power=%02x, DevCtl=%02x)\n", - (musb->bIsMultipoint ? "M" : ""), MUSB_MODE(musb), + (musb->is_multipoint ? "M" : ""), MUSB_MODE(musb), musb_readb(mbase, MGC_O_HDRC_POWER), musb_readb(mbase, MGC_O_HDRC_DEVCTL)); if (count <= 0) diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h index 2c47ff989ce..14fa1b844b9 100644 --- a/drivers/usb/musb/musbdefs.h +++ b/drivers/usb/musb/musbdefs.h @@ -395,7 +395,7 @@ struct musb { /* active means connected and not suspended */ unsigned is_active:1; - unsigned bIsMultipoint:1; + unsigned is_multipoint:1; unsigned is_host:1; unsigned bIgnoreDisconnect:1; /* during bus resets */ diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c index 5cae90b11bc..a432a4e21ca 100644 --- a/drivers/usb/musb/plat_uds.c +++ b/drivers/usb/musb/plat_uds.c @@ -1310,10 +1310,10 @@ static int __init musb_core_init(u16 wType, struct musb *musb) aDate[0] = 0; #endif if (MUSB_CONTROLLER_MHDRC == wType) { - musb->bIsMultipoint = 1; + musb->is_multipoint = 1; type = "M"; } else { - musb->bIsMultipoint = 0; + musb->is_multipoint = 0; type = ""; #ifdef CONFIG_USB_MUSB_HDRC_HCD #ifndef CONFIG_USB_OTG_BLACKLIST_HUB