summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/tusb6010.c
diff options
context:
space:
mode:
authorFelipe Balbi2014-04-16 22:20:44 +0200
committerFelipe Balbi2014-04-21 21:07:24 +0200
commit4525beeb9aadbb9e1cb3e9e135f4371553f26a70 (patch)
tree4c3679819c31984dfa313ee64abaf9f0b6abbb18 /drivers/usb/musb/tusb6010.c
parentusb: gadget: only GPL drivers in the gadget and phy framework (diff)
downloadkernel-qcow2-linux-4525beeb9aadbb9e1cb3e9e135f4371553f26a70.tar.gz
kernel-qcow2-linux-4525beeb9aadbb9e1cb3e9e135f4371553f26a70.tar.xz
kernel-qcow2-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/tusb6010.c')
-rw-r--r--drivers/usb/musb/tusb6010.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 4e9fb1d08698..0c0f5ee1e3f1 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -1065,7 +1065,7 @@ static int tusb_musb_init(struct musb *musb)
void __iomem *sync = NULL;
int ret;
- usb_nop_xceiv_register();
+ usb_phy_generic_register();
musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
if (IS_ERR_OR_NULL(musb->xceiv))
return -EPROBE_DEFER;
@@ -1117,7 +1117,7 @@ done:
iounmap(sync);
usb_put_phy(musb->xceiv);
- usb_nop_xceiv_unregister();
+ usb_phy_generic_unregister();
}
return ret;
}
@@ -1133,7 +1133,7 @@ static int tusb_musb_exit(struct musb *musb)
iounmap(musb->sync_va);
usb_put_phy(musb->xceiv);
- usb_nop_xceiv_unregister();
+ usb_phy_generic_unregister();
return 0;
}