diff options
Diffstat (limited to 'drivers/usb/musb/davinci.c')
-rw-r--r-- | drivers/usb/musb/davinci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index c259dac9d056..c0e07eddb079 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c | |||
@@ -381,7 +381,7 @@ static int davinci_musb_init(struct musb *musb) | |||
381 | u32 revision; | 381 | u32 revision; |
382 | int ret = -ENODEV; | 382 | int ret = -ENODEV; |
383 | 383 | ||
384 | usb_nop_xceiv_register(); | 384 | usb_phy_generic_register(); |
385 | musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); | 385 | musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); |
386 | if (IS_ERR_OR_NULL(musb->xceiv)) { | 386 | if (IS_ERR_OR_NULL(musb->xceiv)) { |
387 | ret = -EPROBE_DEFER; | 387 | ret = -EPROBE_DEFER; |
@@ -439,7 +439,7 @@ static int davinci_musb_init(struct musb *musb) | |||
439 | fail: | 439 | fail: |
440 | usb_put_phy(musb->xceiv); | 440 | usb_put_phy(musb->xceiv); |
441 | unregister: | 441 | unregister: |
442 | usb_nop_xceiv_unregister(); | 442 | usb_phy_generic_unregister(); |
443 | return ret; | 443 | return ret; |
444 | } | 444 | } |
445 | 445 | ||
@@ -487,7 +487,7 @@ static int davinci_musb_exit(struct musb *musb) | |||
487 | phy_off(); | 487 | phy_off(); |
488 | 488 | ||
489 | usb_put_phy(musb->xceiv); | 489 | usb_put_phy(musb->xceiv); |
490 | usb_nop_xceiv_unregister(); | 490 | usb_phy_generic_unregister(); |
491 | 491 | ||
492 | return 0; | 492 | return 0; |
493 | } | 493 | } |