musb_hdrc: Search and replace bAddress with address

Search and replace bAddress with address

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

diff --git a/drivers/usb/musb/g_ep0.c b/drivers/usb/musb/g_ep0.c
index fd9772e3595ed77bc608e73ab5e289e5c7d42f5c..b024d41b9e9a3ef2d569ffe7dbea7a38253e9f5e 100644 (file)
--- a/drivers/usb/musb/g_ep0.c
+++ b/drivers/usb/musb/g_ep0.c
@@ -240,7 +240,7 @@ __acquires(musb->lock)
                case USB_REQ_SET_ADDRESS:
                        /* change it after the status stage */
                        musb->bSetAddress = TRUE;
-                       musb->bAddress = (u8) (pControlRequest->wValue & 0x7f);
+                       musb->address = (u8) (pControlRequest->wValue & 0x7f);
                        handled = 1;
                        break;
 
@@ -663,7 +663,7 @@ irqreturn_t musb_g_ep0_irq(struct musb *musb)
                 */
                if (musb->bSetAddress) {
                        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) */

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index beef56a2daab0b30b4f9f27e7f4ec579e3185106..028b5df8d2bb0f2748c4a3df88b0e9c07e4936e8 100644 (file)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -2010,7 +2010,7 @@ __acquires(musb->lock)
        musb->is_active = 1;
        musb->is_suspended = 0;
        MUSB_DEV_MODE(musb);
-       musb->bAddress = 0;
+       musb->address = 0;
        musb->ep0_state = MGC_END0_STAGE_SETUP;
 
        musb->may_wakeup = 0;

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 493b11c0b81cb55d12298b2fb152807e6905b933..e5b73248f97b80c8cb7a2627ac4938abe099854a 100644 (file)
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -176,7 +176,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
        struct urb              *urb = next_urb(qh);
        struct musb_hw_ep       *hw_ep = qh->hw_ep;
        unsigned                nPipe = urb->pipe;
-       u8                      bAddress = usb_pipedevice(nPipe);
+       u8                      address = usb_pipedevice(nPipe);
        int                     epnum = hw_ep->epnum;
 
        /* initialize software qh state */
@@ -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",
-                       qh, urb, bAddress, qh->epnum,
+                       qh, urb, address, qh->epnum,
                        is_in ? "in" : "out",
                        ({char *s; switch (qh->type) {
                        case USB_ENDPOINT_XFER_CONTROL: s = ""; break;

diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index d6304a0e633d9cabd557264d470b45e01880f6d9..4ebaab756fdad9dbb07a9013c6668336aef36468 100644 (file)
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -442,7 +442,7 @@ struct musb {
        unsigned softconnect:1;
 
        enum musb_g_ep0_state   ep0_state;
-       u8                      bAddress;
+       u8                      address;
        u8                      bTestModeValue;
        u16                     ackpend;                /* ep0 */
        struct usb_gadget       g;                      /* the gadget */