musb_hdrc: Search and replace bIntrUSB with int_usb

Search and replace bIntrUSB with int_usb

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

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index d5af7f27b97686321084221ce6279af36c907721..8c7eb5fa0472a51c24c77fd14d8e7ddf7f68128e 100644 (file)
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -351,7 +351,7 @@ void musb_hnp_stop(struct musb *musb)
  * the order of the tests is specified in the manual
  *
  * @param musb instance pointer
- * @param bIntrUSB register contents
+ * @param int_usb register contents
  * @param devctl
  * @param power
  */
@@ -360,7 +360,7 @@ void musb_hnp_stop(struct musb *musb)
                | MUSB_INTR_VBUSERROR | MUSB_INTR_CONNECT \
                | MUSB_INTR_RESET )
 
-static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
+static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
                                u8 devctl, u8 power)
 {
        irqreturn_t handled = IRQ_NONE;
@@ -368,14 +368,14 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
        void __iomem *mbase = musb->mregs;
 #endif
 
-       DBG(3, "<== Power=%02x, DevCtl=%02x, bIntrUSB=0x%x\n", power, devctl,
-               bIntrUSB);
+       DBG(3, "<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n", power, devctl,
+               int_usb);
 
        /* in host mode, the peripheral may issue remote wakeup.
         * in peripheral mode, the host may resume the link.
         * spurious RESUME irqs happen too, paired with SUSPEND.
         */
-       if (bIntrUSB & MUSB_INTR_RESUME) {
+       if (int_usb & MUSB_INTR_RESUME) {
                handled = IRQ_HANDLED;
                DBG(3, "RESUME (%s)\n", otg_state_string(musb));
 
@@ -456,7 +456,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
 
 #ifdef CONFIG_USB_MUSB_HDRC_HCD
        /* see manual for the order of the tests */
-       if (bIntrUSB & MUSB_INTR_SESSREQ) {
+       if (int_usb & MUSB_INTR_SESSREQ) {
                DBG(1, "SESSION_REQUEST (%s)\n", otg_state_string(musb));
 
                /* IRQ arrives from ID pin sense or (later, if VBUS power
@@ -475,7 +475,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
                handled = IRQ_HANDLED;
        }
 
-       if (bIntrUSB & MUSB_INTR_VBUSERROR) {
+       if (int_usb & MUSB_INTR_VBUSERROR) {
                int     ignore = 0;
 
                /* During connection as an A-Device, we may see a short
@@ -543,7 +543,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
                handled = IRQ_HANDLED;
        }
 
-       if (bIntrUSB & MUSB_INTR_CONNECT) {
+       if (int_usb & MUSB_INTR_CONNECT) {
                struct usb_hcd *hcd = musb_to_hcd(musb);
 
                handled = IRQ_HANDLED;
@@ -603,7 +603,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
        /* mentor saves a bit: bus reset and babble share the same irq.
         * only host sees babble; only peripheral sees bus reset.
         */
-       if (bIntrUSB & MUSB_INTR_RESET) {
+       if (int_usb & MUSB_INTR_RESET) {
                if (devctl & MUSB_DEVCTL_HM) {
                        /*
                         * Looks like non-HS BABBLE can be ignored, but
@@ -638,11 +638,11 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
  * the order of the tests is specified in the manual
  *
  * @param musb instance pointer
- * @param bIntrUSB register contents
+ * @param int_usb register contents
  * @param devctl
  * @param power
  */
-static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB,
+static irqreturn_t musb_stage2_irq(struct musb * musb, u8 int_usb,
                                u8 devctl, u8 power)
 {
        irqreturn_t handled = IRQ_NONE;
@@ -659,7 +659,7 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB,
  * endpoints, relies on TX/RX interval registers, and isn't claimed
  * to support ISO transfers yet.
  */
-       if (bIntrUSB & MUSB_INTR_SOF) {
+       if (int_usb & MUSB_INTR_SOF) {
                void __iomem *mbase = musb->mregs;
                struct musb_hw_ep       *ep;
                u8 epnum;
@@ -690,7 +690,7 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB,
        }
 #endif
 
-       if ((bIntrUSB & MUSB_INTR_DISCONNECT) && !musb->ignore_disconnect) {
+       if ((int_usb & MUSB_INTR_DISCONNECT) && !musb->ignore_disconnect) {
                DBG(1, "DISCONNECT (%s) as %s, devctl %02x\n",
                                otg_state_string(musb),
                                MUSB_MODE(musb), devctl);
@@ -731,7 +731,7 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB,
                schedule_work(&musb->irq_work);
        }
 
-       if (bIntrUSB & MUSB_INTR_SUSPEND) {
+       if (int_usb & MUSB_INTR_SUSPEND) {
                DBG(1, "SUSPEND (%s) devctl %02x power %02x\n",
                                otg_state_string(musb), devctl, power);
                handled = IRQ_HANDLED;