diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-04-16 16:05:17 -0500 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-04-21 14:07:25 -0500 |
| commit | e741e637a85a802a93125dca1ecf324bc414101b (patch) | |
| tree | 24fb14f9c8fd5b922e8008fef852c2b420749f6d /drivers/usb/musb/am35x.c | |
| parent | d7078df6be6e9e5e3ac354859f5b8d60114391b4 (diff) | |
| download | linux-e741e637a85a802a93125dca1ecf324bc414101b.tar.gz linux-e741e637a85a802a93125dca1ecf324bc414101b.tar.bz2 linux-e741e637a85a802a93125dca1ecf324bc414101b.zip | |
usb: musb: move usb_phy_generic_{un,}register calls to probe()/remove()
This patch is in preparation to supporting
calling those functions multiple times.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/am35x.c')
| -rw-r--r-- | drivers/usb/musb/am35x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index 044cd824c70d..05459b56b2a8 100644 --- a/drivers/usb/musb/am35x.c +++ b/drivers/usb/musb/am35x.c @@ -360,7 +360,6 @@ static int am35x_musb_init(struct musb *musb) if (!rev) return -ENODEV; - usb_phy_generic_register(); musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); if (IS_ERR_OR_NULL(musb->xceiv)) return -EPROBE_DEFER; @@ -402,7 +401,6 @@ static int am35x_musb_exit(struct musb *musb) data->set_phy_power(0); usb_put_phy(musb->xceiv); - usb_phy_generic_unregister(); return 0; } @@ -505,6 +503,7 @@ static int am35x_probe(struct platform_device *pdev) pdata->platform_ops = &am35x_ops; + usb_phy_generic_register(); platform_set_drvdata(pdev, glue); pinfo = am35x_dev_info; @@ -547,6 +546,7 @@ static int am35x_remove(struct platform_device *pdev) struct am35x_glue *glue = platform_get_drvdata(pdev); platform_device_unregister(glue->musb); + usb_phy_generic_unregister(); clk_disable(glue->clk); clk_disable(glue->phy_clk); clk_put(glue->clk); |