summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/davinci.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2014-04-16 15:20:44 -0500
committerFelipe Balbi <balbi@ti.com>2014-04-21 14:07:24 -0500
commit4525beeb9aadbb9e1cb3e9e135f4371553f26a70 (patch)
tree4c3679819c31984dfa313ee64abaf9f0b6abbb18 /drivers/usb/musb/davinci.c
parent0700faaf736492bd203630d179b639a1f5bbb576 (diff)
downloadblackbird-op-linux-4525beeb9aadbb9e1cb3e9e135f4371553f26a70.tar.gz
blackbird-op-linux-4525beeb9aadbb9e1cb3e9e135f4371553f26a70.zip
usb: phy: rename usb_nop_xceiv to usb_phy_generic
no functional changes, just renaming the function in order to make it slightly clearer what it should be used for, also matching the driver name. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/davinci.c')
-rw-r--r--drivers/usb/musb/davinci.c6
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)
u32 revision;
int ret = -ENODEV;
- usb_nop_xceiv_register();
+ usb_phy_generic_register();
musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
if (IS_ERR_OR_NULL(musb->xceiv)) {
ret = -EPROBE_DEFER;
@@ -439,7 +439,7 @@ static int davinci_musb_init(struct musb *musb)
fail:
usb_put_phy(musb->xceiv);
unregister:
- usb_nop_xceiv_unregister();
+ usb_phy_generic_unregister();
return ret;
}
@@ -487,7 +487,7 @@ static int davinci_musb_exit(struct musb *musb)
phy_off();
usb_put_phy(musb->xceiv);
- usb_nop_xceiv_unregister();
+ usb_phy_generic_unregister();
return 0;
}
OpenPOWER on IntegriCloud