diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-04 09:58:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-04 09:58:56 -0400 |
| commit | a7b15ab887e5b8e9803136b5a4a0008d7a3dea86 (patch) | |
| tree | ca5342d29badb2a3cce2a353b786c8ab4a993c1e /drivers/usb/musb/musb_dsps.c | |
| parent | b05f03b232ab4f8f173eeae291a4c9cd662a6676 (diff) | |
| parent | 1504269814263c9676b4605a6a91e14dc6ceac21 (diff) | |
| download | linux-a7b15ab887e5b8e9803136b5a4a0008d7a3dea86.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in selftests Makefile.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/musb/musb_dsps.c')
| -rw-r--r-- | drivers/usb/musb/musb_dsps.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index 05a679d5e3a2..6a60bc0490c5 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -451,7 +451,6 @@ static int dsps_musb_init(struct musb *musb) if (!rev) return -ENODEV; - usb_phy_init(musb->xceiv); if (IS_ERR(musb->phy)) { musb->phy = NULL; } else { @@ -501,7 +500,6 @@ static int dsps_musb_exit(struct musb *musb) struct dsps_glue *glue = dev_get_drvdata(dev->parent); del_timer_sync(&musb->dev_timer); - usb_phy_shutdown(musb->xceiv); phy_power_off(musb->phy); phy_exit(musb->phy); debugfs_remove_recursive(glue->dbgfs_root); |