diff options
author | Felipe Contreras <felipe.contreras@gmail.com> | 2011-12-19 15:17:50 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-12-20 06:55:14 -0500 |
commit | 08dec56ee29f06b4fbdf5f5b1b3d2c2397aabe17 (patch) | |
tree | 4a2e98388861862a6a99efce0e410283414b17d6 /drivers | |
parent | b3314d9ac55f4aa13fd339ee16e95828414f51d4 (diff) |
usb: musb: remove a bit of indentation
And use dev instead of musb->controller.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/musb/omap2430.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 34c169896836..4f31814eebf3 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
@@ -352,20 +352,19 @@ static void omap2430_musb_enable(struct musb *musb) | |||
352 | 352 | ||
353 | case USB_EVENT_ID: | 353 | case USB_EVENT_ID: |
354 | otg_init(musb->xceiv); | 354 | otg_init(musb->xceiv); |
355 | if (data->interface_type == MUSB_INTERFACE_UTMI) { | 355 | if (data->interface_type != MUSB_INTERFACE_UTMI) |
356 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | 356 | break; |
357 | /* start the session */ | 357 | devctl = musb_readb(musb->mregs, MUSB_DEVCTL); |
358 | devctl |= MUSB_DEVCTL_SESSION; | 358 | /* start the session */ |
359 | musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); | 359 | devctl |= MUSB_DEVCTL_SESSION; |
360 | while (musb_readb(musb->mregs, MUSB_DEVCTL) & | 360 | musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); |
361 | MUSB_DEVCTL_BDEVICE) { | 361 | while (musb_readb(musb->mregs, MUSB_DEVCTL) & |
362 | cpu_relax(); | 362 | MUSB_DEVCTL_BDEVICE) { |
363 | 363 | cpu_relax(); | |
364 | if (time_after(jiffies, timeout)) { | 364 | |
365 | dev_err(musb->controller, | 365 | if (time_after(jiffies, timeout)) { |
366 | "configured as A device timeout"); | 366 | dev_err(dev, "configured as A device timeout"); |
367 | break; | 367 | break; |
368 | } | ||
369 | } | 368 | } |
370 | } | 369 | } |
371 | break; | 370 | break; |