Skip to content

Commit

Permalink
usb: musb: core: use ->resume instead ->resume_noirq
Browse files Browse the repository at this point in the history
In commit 0ec8fd7 ("USB: musb: fix possible panic while resuming")
musb_resume() became musb_resume_early() in order to enable the clocks
early on resume. This piece of the resume code was removed later in
commit 0349176 ("usb: musb: move clock handling to glue layer").
In between the function was renamed from musb_resume_early() to
musb_resume_noirq() by commit commit 48fea96 ("USB: Rework musb
suspend()/resume_early()").

Now I see that first musb_core is resumed followed by phy and glue
layer and I ask myself is this really what we intend to do? This kind
of revoked the purpose of the first commit (0ec8fd7).
Because of this and because it looks wrong to resume (core) before the
glue layer I push it to the ->resume callback.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Sebastian Andrzej Siewior authored and Felipe Balbi committed Nov 3, 2014
1 parent 7b093f7 commit 3e87d9a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/musb/musb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2297,7 +2297,7 @@ static int musb_suspend(struct device *dev)
return 0;
}

static int musb_resume_noirq(struct device *dev)
static int musb_resume(struct device *dev)
{
struct musb *musb = dev_to_musb(dev);

Expand Down Expand Up @@ -2348,7 +2348,7 @@ static int musb_runtime_resume(struct device *dev)

static const struct dev_pm_ops musb_dev_pm_ops = {
.suspend = musb_suspend,
.resume_noirq = musb_resume_noirq,
.resume = musb_resume,
.runtime_suspend = musb_runtime_suspend,
.runtime_resume = musb_runtime_resume,
};
Expand Down

0 comments on commit 3e87d9a

Please sign in to comment.