Commit 136cdea3 authored by Tony Lindgren's avatar Tony Lindgren

musb_hdrc: Search and replace bAddress with address

Search and replace bAddress with address
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 35289e80
...@@ -240,7 +240,7 @@ __acquires(musb->lock) ...@@ -240,7 +240,7 @@ __acquires(musb->lock)
case USB_REQ_SET_ADDRESS: case USB_REQ_SET_ADDRESS:
/* change it after the status stage */ /* change it after the status stage */
musb->bSetAddress = TRUE; musb->bSetAddress = TRUE;
musb->bAddress = (u8) (pControlRequest->wValue & 0x7f); musb->address = (u8) (pControlRequest->wValue & 0x7f);
handled = 1; handled = 1;
break; break;
...@@ -663,7 +663,7 @@ irqreturn_t musb_g_ep0_irq(struct musb *musb) ...@@ -663,7 +663,7 @@ irqreturn_t musb_g_ep0_irq(struct musb *musb)
*/ */
if (musb->bSetAddress) { if (musb->bSetAddress) {
musb->bSetAddress = FALSE; musb->bSetAddress = FALSE;
musb_writeb(mbase, MGC_O_HDRC_FADDR, musb->bAddress); musb_writeb(mbase, MGC_O_HDRC_FADDR, musb->address);
} }
/* enter test mode if needed (exit by reset) */ /* enter test mode if needed (exit by reset) */
......
...@@ -2010,7 +2010,7 @@ __acquires(musb->lock) ...@@ -2010,7 +2010,7 @@ __acquires(musb->lock)
musb->is_active = 1; musb->is_active = 1;
musb->is_suspended = 0; musb->is_suspended = 0;
MUSB_DEV_MODE(musb); MUSB_DEV_MODE(musb);
musb->bAddress = 0; musb->address = 0;
musb->ep0_state = MGC_END0_STAGE_SETUP; musb->ep0_state = MGC_END0_STAGE_SETUP;
musb->may_wakeup = 0; musb->may_wakeup = 0;
......
...@@ -176,7 +176,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) ...@@ -176,7 +176,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
struct urb *urb = next_urb(qh); struct urb *urb = next_urb(qh);
struct musb_hw_ep *hw_ep = qh->hw_ep; struct musb_hw_ep *hw_ep = qh->hw_ep;
unsigned nPipe = urb->pipe; unsigned nPipe = urb->pipe;
u8 bAddress = usb_pipedevice(nPipe); u8 address = usb_pipedevice(nPipe);
int epnum = hw_ep->epnum; int epnum = hw_ep->epnum;
/* initialize software qh state */ /* initialize software qh state */
...@@ -205,7 +205,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) ...@@ -205,7 +205,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
} }
DBG(4, "qh %p urb %p dev%d ep%d%s%s, hw_ep %d, %p/%d\n", DBG(4, "qh %p urb %p dev%d ep%d%s%s, hw_ep %d, %p/%d\n",
qh, urb, bAddress, qh->epnum, qh, urb, address, qh->epnum,
is_in ? "in" : "out", is_in ? "in" : "out",
({char *s; switch (qh->type) { ({char *s; switch (qh->type) {
case USB_ENDPOINT_XFER_CONTROL: s = ""; break; case USB_ENDPOINT_XFER_CONTROL: s = ""; break;
......
...@@ -442,7 +442,7 @@ struct musb { ...@@ -442,7 +442,7 @@ struct musb {
unsigned softconnect:1; unsigned softconnect:1;
enum musb_g_ep0_state ep0_state; enum musb_g_ep0_state ep0_state;
u8 bAddress; u8 address;
u8 bTestModeValue; u8 bTestModeValue;
u16 ackpend; /* ep0 */ u16 ackpend; /* ep0 */
struct usb_gadget g; /* the gadget */ struct usb_gadget g; /* the gadget */
......
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