diff options
| author | Felipe Balbi <balbi@ti.com> | 2013-03-07 12:39:57 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-03-18 13:18:03 +0400 |
| commit | 42c0bf1ce7c067bbc3e77d5626f102a16bc4fb6b (patch) | |
| tree | d3ede9364742732f0e53966e3be9bcfd253255dd /drivers/usb/musb/davinci.c | |
| parent | 6a1e3ef45fb0c4d79cbb5190c8fc59263c630b0e (diff) | |
| download | linux-42c0bf1ce7c067bbc3e77d5626f102a16bc4fb6b.tar.xz | |
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/davinci.c')
| -rw-r--r-- | drivers/usb/musb/davinci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index e040d9103735..bea6cc35471c 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -215,7 +215,7 @@ static void otg_timer(unsigned long _musb) */ devctl = musb_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) { @@ -349,7 +349,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci) davinci_musb_source_power(musb, drvvbus, 0); 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); retval = IRQ_HANDLED; |