Commit be75d8f1 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: musb: dsps: drop duplicate phy initialisation

Since commit 39cee200 ("usb: musb: core: call init and shutdown for
the usb phy") the musb USB phy is initialised by musb_core, but the
original initialisation in the dsps-glue init callback was left in
place resulting in two calls to phy init during probe (and similarly,
two shutdowns on remove).

Drop the duplicate phy init and shutdown calls from the dsps glue in
favour of the ones in musb core, which other glue drivers rely on.

Note however that any generic phy is still initialised in the glue init
callback (just as for the other drivers).

Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f81f118
...@@ -451,7 +451,6 @@ static int dsps_musb_init(struct musb *musb) ...@@ -451,7 +451,6 @@ static int dsps_musb_init(struct musb *musb)
if (!rev) if (!rev)
return -ENODEV; return -ENODEV;
usb_phy_init(musb->xceiv);
if (IS_ERR(musb->phy)) { if (IS_ERR(musb->phy)) {
musb->phy = NULL; musb->phy = NULL;
} else { } else {
...@@ -501,7 +500,6 @@ static int dsps_musb_exit(struct musb *musb) ...@@ -501,7 +500,6 @@ static int dsps_musb_exit(struct musb *musb)
struct dsps_glue *glue = dev_get_drvdata(dev->parent); struct dsps_glue *glue = dev_get_drvdata(dev->parent);
del_timer_sync(&musb->dev_timer); del_timer_sync(&musb->dev_timer);
usb_phy_shutdown(musb->xceiv);
phy_power_off(musb->phy); phy_power_off(musb->phy);
phy_exit(musb->phy); phy_exit(musb->phy);
debugfs_remove_recursive(glue->dbgfs_root); debugfs_remove_recursive(glue->dbgfs_root);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment