usb: fix building musb drivers

Commit 3dacdf11 "usb: factor out state_string() on otg drivers"
broke building musb drivers since there is already another
otg_state_string() function in musb drivers, but with different
prototype. Fix musb drivers to use common otg_state_string(), too.

Also provide a nop for otg_state_string() if CONFIG_USB_OTG_UTILS
is not defined.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index d5a3da37c90c..9e6209f87d3b 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -151,7 +151,8 @@ static void otg_timer(unsigned long _musb)
          * status change events (from the transceiver) otherwise.
          */
         devctl = musb_readb(mregs, MUSB_DEVCTL);
-        DBG(7, "Poll devctl %02x (%s)\n", devctl, otg_state_string(musb));
+        DBG(7, "Poll devctl %02x (%s)\n", devctl,
+                otg_state_string(musb->xceiv->state));
 
         spin_lock_irqsave(&musb->lock, flags);
         switch (musb->xceiv->state) {
@@ -202,7 +203,8 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout)
         /* Never idle if active, or when VBUS timeout is not set as host */
         if (musb->is_active || (musb->a_wait_bcon == 0 &&
                                 musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) {
-                DBG(4, "%s active, deleting timer\n", otg_state_string(musb));
+                DBG(4, "%s active, deleting timer\n",
+                        otg_state_string(musb->xceiv->state));
                 del_timer(&otg_workaround);
                 last_timer = jiffies;
                 return;
@@ -215,7 +217,8 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout)
         last_timer = timeout;
 
         DBG(4, "%s inactive, starting idle timer for %u ms\n",
-            otg_state_string(musb), jiffies_to_msecs(timeout - jiffies));
+                otg_state_string(musb->xceiv->state),
+                jiffies_to_msecs(timeout - jiffies));
         mod_timer(&otg_workaround, timeout);
 }
 
@@ -304,7 +307,7 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
                 /* NOTE: this must complete power-on within 100 ms. */
                 DBG(2, "VBUS %s (%s)%s, devctl %02x\n",
                                 drvvbus ? "on" : "off",
-                                otg_state_string(musb),
+                                otg_state_string(musb->xceiv->state),
                                 err ? " ERROR" : "",
                                 devctl);
                 ret = IRQ_HANDLED;