aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_gadget.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-03-07 03:39:57 -0500
committerFelipe Balbi <balbi@ti.com>2013-03-18 05:18:03 -0400
commit42c0bf1ce7c067bbc3e77d5626f102a16bc4fb6b (patch)
treed3ede9364742732f0e53966e3be9bcfd253255dd /drivers/usb/musb/musb_gadget.c
parent6a1e3ef45fb0c4d79cbb5190c8fc59263c630b0e (diff)
usb: otg: prefix otg_state_string with usb_
all other functions under drivers/usb/ start with usb_, let's do the same thing. This patch is in preparation for moving otg_state_string to usb-common.c and deleting otg.c completely. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/musb_gadget.c')
-rw-r--r--drivers/usb/musb/musb_gadget.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 6101ebf803fd..e8408883ab0d 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1571,7 +1571,7 @@ static int musb_gadget_wakeup(struct usb_gadget *gadget)
1571 goto done; 1571 goto done;
1572 default: 1572 default:
1573 dev_dbg(musb->controller, "Unhandled wake: %s\n", 1573 dev_dbg(musb->controller, "Unhandled wake: %s\n",
1574 otg_state_string(musb->xceiv->state)); 1574 usb_otg_state_string(musb->xceiv->state));
1575 goto done; 1575 goto done;
1576 } 1576 }
1577 1577
@@ -1970,7 +1970,7 @@ void musb_g_resume(struct musb *musb)
1970 break; 1970 break;
1971 default: 1971 default:
1972 WARNING("unhandled RESUME transition (%s)\n", 1972 WARNING("unhandled RESUME transition (%s)\n",
1973 otg_state_string(musb->xceiv->state)); 1973 usb_otg_state_string(musb->xceiv->state));
1974 } 1974 }
1975} 1975}
1976 1976
@@ -2000,7 +2000,7 @@ void musb_g_suspend(struct musb *musb)
2000 * A_PERIPHERAL may need care too 2000 * A_PERIPHERAL may need care too
2001 */ 2001 */
2002 WARNING("unhandled SUSPEND transition (%s)\n", 2002 WARNING("unhandled SUSPEND transition (%s)\n",
2003 otg_state_string(musb->xceiv->state)); 2003 usb_otg_state_string(musb->xceiv->state));
2004 } 2004 }
2005} 2005}
2006 2006
@@ -2034,7 +2034,7 @@ void musb_g_disconnect(struct musb *musb)
2034 switch (musb->xceiv->state) { 2034 switch (musb->xceiv->state) {
2035 default: 2035 default:
2036 dev_dbg(musb->controller, "Unhandled disconnect %s, setting a_idle\n", 2036 dev_dbg(musb->controller, "Unhandled disconnect %s, setting a_idle\n",
2037 otg_state_string(musb->xceiv->state)); 2037 usb_otg_state_string(musb->xceiv->state));
2038 musb->xceiv->state = OTG_STATE_A_IDLE; 2038 musb->xceiv->state = OTG_STATE_A_IDLE;
2039 MUSB_HST_MODE(musb); 2039 MUSB_HST_MODE(musb);
2040 break; 2040 break;