| Message ID | 20180413151505.32663-2-johan@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 13, 2018 at 05:15:03PM +0200, Johan Hovold wrote: > Since commit 39cee200c23e ("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. Hmm, I don't remember the details of my debug session that led to 39cee200c23e, and I don't have access to the hardware in question any more. But your commit logs makes sense, so Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Given that it took 2+ years to find this, backporting to stable and a Fixes: line are probably not necessary. Best regards Uwe
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);
Since commit 39cee200c23e ("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: Johan Hovold <johan@kernel.org> --- drivers/usb/musb/musb_dsps.c | 2 -- 1 file changed, 2 deletions(-)