Commit 90129a47 authored by Tony Lindgren's avatar Tony Lindgren

musb_hdrc: Search and replace bIsMultipoint with is_multipoint

Search and replace bIsMultipoint with is_multipoint
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 470aec12
...@@ -599,7 +599,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep) ...@@ -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 */ /* target addr and (for multipoint) hub addr/port */
if (musb->bIsMultipoint) { if (musb->is_multipoint) {
musb_writeb(ep->target_regs, MGC_O_HDRC_RXFUNCADDR, musb_writeb(ep->target_regs, MGC_O_HDRC_RXFUNCADDR,
qh->addr_reg); qh->addr_reg);
musb_writeb(ep->target_regs, MGC_O_HDRC_RXHUBADDR, musb_writeb(ep->target_regs, MGC_O_HDRC_RXHUBADDR,
...@@ -720,7 +720,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, ...@@ -720,7 +720,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
} }
/* target addr and (for multipoint) hub addr/port */ /* target addr and (for multipoint) hub addr/port */
if (musb->bIsMultipoint) { if (musb->is_multipoint) {
musb_writeb(mbase, musb_writeb(mbase,
MGC_BUSCTL_OFFSET(epnum, MGC_O_HDRC_TXFUNCADDR), MGC_BUSCTL_OFFSET(epnum, MGC_O_HDRC_TXFUNCADDR),
qh->addr_reg); qh->addr_reg);
...@@ -748,7 +748,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, ...@@ -748,7 +748,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
musb_writeb(epio, MGC_O_HDRC_TXINTERVAL, qh->intv_reg); musb_writeb(epio, MGC_O_HDRC_TXINTERVAL, qh->intv_reg);
} else { } else {
musb_writeb(epio, MGC_O_HDRC_NAKLIMIT0, qh->intv_reg); musb_writeb(epio, MGC_O_HDRC_NAKLIMIT0, qh->intv_reg);
if (musb->bIsMultipoint) if (musb->is_multipoint)
musb_writeb(epio, MGC_O_HDRC_TYPE0, musb_writeb(epio, MGC_O_HDRC_TYPE0,
qh->type_reg); qh->type_reg);
} }
...@@ -1850,7 +1850,7 @@ static int musb_urb_enqueue( ...@@ -1850,7 +1850,7 @@ static int musb_urb_enqueue(
qh->intv_reg = interval; qh->intv_reg = interval;
/* precompute addressing for external hub/tt ports */ /* precompute addressing for external hub/tt ports */
if (musb->bIsMultipoint) { if (musb->is_multipoint) {
struct usb_device *parent = urb->dev->parent; struct usb_device *parent = urb->dev->parent;
if (parent != hcd->self.root_hub) { if (parent != hcd->self.root_hub) {
......
...@@ -490,7 +490,7 @@ static int dump_header_stats(struct musb *musb, char *buffer) ...@@ -490,7 +490,7 @@ static int dump_header_stats(struct musb *musb, char *buffer)
*buffer = 0; *buffer = 0;
count = sprintf(buffer, "Status: %sHDRC, Mode=%s " count = sprintf(buffer, "Status: %sHDRC, Mode=%s "
"(Power=%02x, DevCtl=%02x)\n", "(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_POWER),
musb_readb(mbase, MGC_O_HDRC_DEVCTL)); musb_readb(mbase, MGC_O_HDRC_DEVCTL));
if (count <= 0) if (count <= 0)
......
...@@ -395,7 +395,7 @@ struct musb { ...@@ -395,7 +395,7 @@ struct musb {
/* active means connected and not suspended */ /* active means connected and not suspended */
unsigned is_active:1; unsigned is_active:1;
unsigned bIsMultipoint:1; unsigned is_multipoint:1;
unsigned is_host:1; unsigned is_host:1;
unsigned bIgnoreDisconnect:1; /* during bus resets */ unsigned bIgnoreDisconnect:1; /* during bus resets */
......
...@@ -1310,10 +1310,10 @@ static int __init musb_core_init(u16 wType, struct musb *musb) ...@@ -1310,10 +1310,10 @@ static int __init musb_core_init(u16 wType, struct musb *musb)
aDate[0] = 0; aDate[0] = 0;
#endif #endif
if (MUSB_CONTROLLER_MHDRC == wType) { if (MUSB_CONTROLLER_MHDRC == wType) {
musb->bIsMultipoint = 1; musb->is_multipoint = 1;
type = "M"; type = "M";
} else { } else {
musb->bIsMultipoint = 0; musb->is_multipoint = 0;
type = ""; type = "";
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
#ifndef CONFIG_USB_OTG_BLACKLIST_HUB #ifndef CONFIG_USB_OTG_BLACKLIST_HUB
......
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