1 files changed, 33 insertions, 38 deletions

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index daec6e0f7e38..37a261a6bb6a 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -372,13 +372,13 @@ static void musb_otg_timer_func(unsigned long data)
         case OTG_STATE_A_SUSPEND:
         case OTG_STATE_A_WAIT_BCON:
                 dev_dbg(musb->controller, "HNP: %s timeout\n",
-                        otg_state_string(musb->xceiv->state));
+                        usb_otg_state_string(musb->xceiv->state));
                 musb_platform_set_vbus(musb, 0);
                 musb->xceiv->state = OTG_STATE_A_WAIT_VFALL;
                 break;
         default:
                 dev_dbg(musb->controller, "HNP: Unhandled mode %s\n",
-                        otg_state_string(musb->xceiv->state));
+                        usb_otg_state_string(musb->xceiv->state));
         }
         musb->ignore_disconnect = 0;
         spin_unlock_irqrestore(&musb->lock, flags);
@@ -393,13 +393,14 @@ void musb_hnp_stop(struct musb *musb)
         void __iomem    *mbase = musb->mregs;
         u8      reg;
 
-        dev_dbg(musb->controller, "HNP: stop from %s\n", otg_state_string(musb->xceiv->state));
+        dev_dbg(musb->controller, "HNP: stop from %s\n",
+                        usb_otg_state_string(musb->xceiv->state));
 
         switch (musb->xceiv->state) {
         case OTG_STATE_A_PERIPHERAL:
                 musb_g_disconnect(musb);
                 dev_dbg(musb->controller, "HNP: back to %s\n",
-                        otg_state_string(musb->xceiv->state));
+                        usb_otg_state_string(musb->xceiv->state));
                 break;
         case OTG_STATE_B_HOST:
                 dev_dbg(musb->controller, "HNP: Disabling HR\n");
@@ -413,7 +414,7 @@ void musb_hnp_stop(struct musb *musb)
                 break;
         default:
                 dev_dbg(musb->controller, "HNP: Stopping in unknown state %s\n",
-                        otg_state_string(musb->xceiv->state));
+                        usb_otg_state_string(musb->xceiv->state));
         }
 
         /*
@@ -451,7 +452,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
          */
         if (int_usb & MUSB_INTR_RESUME) {
                 handled = IRQ_HANDLED;
-                dev_dbg(musb->controller, "RESUME (%s)\n", otg_state_string(musb->xceiv->state));
+                dev_dbg(musb->controller, "RESUME (%s)\n", usb_otg_state_string(musb->xceiv->state));
 
                 if (devctl & MUSB_DEVCTL_HM) {
                         void __iomem *mbase = musb->mregs;
@@ -493,7 +494,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                         default:
                                 WARNING("bogus %s RESUME (%s)\n",
                                         "host",
-                                        otg_state_string(musb->xceiv->state));
+                                        usb_otg_state_string(musb->xceiv->state));
                         }
                 } else {
                         switch (musb->xceiv->state) {
@@ -522,7 +523,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                         default:
                                 WARNING("bogus %s RESUME (%s)\n",
                                         "peripheral",
-                                        otg_state_string(musb->xceiv->state));
+                                        usb_otg_state_string(musb->xceiv->state));
                         }
                 }
         }
@@ -538,7 +539,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                 }
 
                 dev_dbg(musb->controller, "SESSION_REQUEST (%s)\n",
-                        otg_state_string(musb->xceiv->state));
+                        usb_otg_state_string(musb->xceiv->state));
 
                 /* IRQ arrives from ID pin sense or (later, if VBUS power
                  * is removed) SRP.  responses are time critical:
@@ -602,8 +603,9 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                         break;
                 }
 
-                dev_dbg(musb->controller, "VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n",
-                                otg_state_string(musb->xceiv->state),
+                dev_printk(ignore ? KERN_DEBUG : KERN_ERR, musb->controller,
+                                "VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n",
+                                usb_otg_state_string(musb->xceiv->state),
                                 devctl,
                                 ({ char *s;
                                 switch (devctl & MUSB_DEVCTL_VBUS) {
@@ -628,7 +630,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 
         if (int_usb & MUSB_INTR_SUSPEND) {
                 dev_dbg(musb->controller, "SUSPEND (%s) devctl %02x\n",
-                        otg_state_string(musb->xceiv->state), devctl);
+                        usb_otg_state_string(musb->xceiv->state), devctl);
                 handled = IRQ_HANDLED;
 
                 switch (musb->xceiv->state) {
@@ -745,12 +747,12 @@ b_host:
                         usb_hcd_resume_root_hub(hcd);
 
                 dev_dbg(musb->controller, "CONNECT (%s) devctl %02x\n",
-                                otg_state_string(musb->xceiv->state), devctl);
+                                usb_otg_state_string(musb->xceiv->state), devctl);
         }
 
         if ((int_usb & MUSB_INTR_DISCONNECT) && !musb->ignore_disconnect) {
                 dev_dbg(musb->controller, "DISCONNECT (%s) as %s, devctl %02x\n",
-                                otg_state_string(musb->xceiv->state),
+                                usb_otg_state_string(musb->xceiv->state),
                                 MUSB_MODE(musb), devctl);
                 handled = IRQ_HANDLED;
 
@@ -787,7 +789,7 @@ b_host:
                         break;
                 default:
                         WARNING("unhandled DISCONNECT transition (%s)\n",
-                                otg_state_string(musb->xceiv->state));
+                                usb_otg_state_string(musb->xceiv->state));
                         break;
                 }
         }
@@ -813,7 +815,7 @@ b_host:
                         }
                 } else {
                         dev_dbg(musb->controller, "BUS RESET as %s\n",
-                                otg_state_string(musb->xceiv->state));
+                                usb_otg_state_string(musb->xceiv->state));
                         switch (musb->xceiv->state) {
                         case OTG_STATE_A_SUSPEND:
                                 /* We need to ignore disconnect on suspend
@@ -826,7 +828,7 @@ b_host:
                         case OTG_STATE_A_WAIT_BCON:     /* OPT TD.4.7-900ms */
                                 /* never use invalid T(a_wait_bcon) */
                                 dev_dbg(musb->controller, "HNP: in %s, %d msec timeout\n",
-                                        otg_state_string(musb->xceiv->state),
+                                        usb_otg_state_string(musb->xceiv->state),
                                         TA_WAIT_BCON(musb));
                                 mod_timer(&musb->otg_timer, jiffies
                                         + msecs_to_jiffies(TA_WAIT_BCON(musb)));
@@ -838,7 +840,7 @@ b_host:
                                 break;
                         case OTG_STATE_B_WAIT_ACON:
                                 dev_dbg(musb->controller, "HNP: RESET (%s), to b_peripheral\n",
-                                        otg_state_string(musb->xceiv->state));
+                                        usb_otg_state_string(musb->xceiv->state));
                                 musb->xceiv->state = OTG_STATE_B_PERIPHERAL;
                                 musb_g_reset(musb);
                                 break;
@@ -850,7 +852,7 @@ b_host:
                                 break;
                         default:
                                 dev_dbg(musb->controller, "Unhandled BUS RESET as %s\n",
-                                        otg_state_string(musb->xceiv->state));
+                                        usb_otg_state_string(musb->xceiv->state));
                         }
                 }
         }
@@ -1632,7 +1634,7 @@ musb_mode_show(struct device *dev, struct device_attribute *attr, char *buf)
         int ret = -EINVAL;
 
         spin_lock_irqsave(&musb->lock, flags);
-        ret = sprintf(buf, "%s\n", otg_state_string(musb->xceiv->state));
+        ret = sprintf(buf, "%s\n", usb_otg_state_string(musb->xceiv->state));
         spin_unlock_irqrestore(&musb->lock, flags);
 
         return ret;
@@ -1951,9 +1953,13 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
                 musb_write_ulpi_buscontrol(musb->mregs, busctl);
         }
 
-        MUSB_DEV_MODE(musb);
-        musb->xceiv->otg->default_a = 0;
-        musb->xceiv->state = OTG_STATE_B_IDLE;
+        if (musb->xceiv->otg->default_a) {
+                MUSB_HST_MODE(musb);
+                musb->xceiv->state = OTG_STATE_A_IDLE;
+        } else {
+                MUSB_DEV_MODE(musb);
+                musb->xceiv->state = OTG_STATE_B_IDLE;
+        }
 
         status = musb_gadget_setup(musb);
 
@@ -2008,7 +2014,6 @@ static int musb_probe(struct platform_device *pdev)
 {
         struct device   *dev = &pdev->dev;
         int             irq = platform_get_irq_byname(pdev, "mc");
-        int             status;
         struct resource *iomem;
         void __iomem    *base;
 
@@ -2016,24 +2021,17 @@ static int musb_probe(struct platform_device *pdev)
         if (!iomem || irq <= 0)
                 return -ENODEV;
 
-        base = ioremap(iomem->start, resource_size(iomem));
-        if (!base) {
-                dev_err(dev, "ioremap failed\n");
-                return -ENOMEM;
-        }
+        base = devm_ioremap_resource(dev, iomem);
+        if (IS_ERR(base))
+                return PTR_ERR(base);
 
-        status = musb_init_controller(dev, irq, base);
-        if (status < 0)
-                iounmap(base);
-
-        return status;
+        return musb_init_controller(dev, irq, base);
 }
 
 static int musb_remove(struct platform_device *pdev)
 {
         struct device   *dev = &pdev->dev;
         struct musb     *musb = dev_to_musb(dev);
-        void __iomem    *ctrl_base = musb->ctrl_base;
 
         /* this gets called on rmmod.
          *  - Host mode: host may still be active
@@ -2044,7 +2042,6 @@ static int musb_remove(struct platform_device *pdev)
         musb_shutdown(pdev);
 
         musb_free(musb);
-        iounmap(ctrl_base);
         device_init_wakeup(dev, 0);
 #ifndef CONFIG_MUSB_PIO_ONLY
         dma_set_mask(dev, *dev->parent->dma_mask);
@@ -2293,8 +2290,6 @@ static int __init musb_init(void)
         if (usb_disabled())
                 return 0;
 
-        pr_info("%s: version " MUSB_VERSION ", ?dma?, otg (peripheral+host)\n",
-                musb_driver_name);
         return platform_driver_register(&musb_driver);
 }
 module_init(musb_init);