1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 6bb89715b637..3a18e44e9391 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/usb/nop-usb-xceiv.h>
 #include <linux/platform_data/usb-omap.h>
+#include <linux/sizes.h>
 
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -224,7 +225,7 @@ static void otg_timer(unsigned long _musb)
          */
         devctl = dsps_readb(mregs, MUSB_DEVCTL);
         dev_dbg(musb->controller, "Poll devctl %02x (%s)\n", devctl,
-                                otg_state_string(musb->xceiv->state));
+                                usb_otg_state_string(musb->xceiv->state));
 
         spin_lock_irqsave(&musb->lock, flags);
         switch (musb->xceiv->state) {
@@ -273,7 +274,7 @@ static void dsps_musb_try_idle(struct musb *musb, unsigned long timeout)
         if (musb->is_active || (musb->a_wait_bcon == 0 &&
                                 musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) {
                 dev_dbg(musb->controller, "%s active, deleting timer\n",
-                                otg_state_string(musb->xceiv->state));
+                                usb_otg_state_string(musb->xceiv->state));
                 del_timer(&glue->timer[pdev->id]);
                 glue->last_timer[pdev->id] = jiffies;
                 return;
@@ -288,7 +289,7 @@ static void dsps_musb_try_idle(struct musb *musb, unsigned long timeout)
         glue->last_timer[pdev->id] = timeout;
 
         dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n",
-                otg_state_string(musb->xceiv->state),
+                usb_otg_state_string(musb->xceiv->state),
                         jiffies_to_msecs(timeout - jiffies));
         mod_timer(&glue->timer[pdev->id], timeout);
 }
@@ -334,7 +335,7 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)
          * value but DEVCTL.BDEVICE is invalid without DEVCTL.SESSION set.
          * Also, DRVVBUS pulses for SRP (but not at 5V) ...
          */
-        if (usbintr & MUSB_INTR_BABBLE)
+        if (is_host_active(musb) && usbintr & MUSB_INTR_BABBLE)
                 pr_info("CAUTION: musb: Babble Interrupt Occurred\n");
 
         if (usbintr & ((1 << wrp->drvvbus) << wrp->usb_shift)) {
@@ -377,7 +378,7 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)
                 /* NOTE: this must complete power-on within 100 ms. */
                 dev_dbg(musb->controller, "VBUS %s (%s)%s, devctl %02x\n",
                                 drvvbus ? "on" : "off",
-                                otg_state_string(musb->xceiv->state),
+                                usb_otg_state_string(musb->xceiv->state),
                                 err ? " ERROR" : "",
                                 devctl);
                 ret = IRQ_HANDLED;
@@ -596,14 +597,13 @@ err0:
 
 static int dsps_probe(struct platform_device *pdev)
 {
-        struct device_node *np = pdev->dev.of_node;
         const struct of_device_id *match;
         const struct dsps_musb_wrapper *wrp;
         struct dsps_glue *glue;
         struct resource *iomem;
         int ret, i;
 
-        match = of_match_node(musb_dsps_of_match, np);
+        match = of_match_node(musb_dsps_of_match, pdev->dev.of_node);
         if (!match) {
                 dev_err(&pdev->dev, "fail to get matching of_match struct\n");
                 ret = -EINVAL;