Commit 33c33740 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

PM: Remove unnecessary goto from device_resume_noirq()

In device_resume_noirq() there is the 'End' label and the associated
goto statement that aren't strictly necessary, so rework the code to
get rid of them.  Also modify device_suspend_noirq() so that it looks
completely analogous to device_resume_noirq().
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent f2511774
...@@ -372,14 +372,11 @@ static int device_resume_noirq(struct device *dev, pm_message_t state) ...@@ -372,14 +372,11 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
TRACE_DEVICE(dev); TRACE_DEVICE(dev);
TRACE_RESUME(0); TRACE_RESUME(0);
if (!dev->bus) if (dev->bus && dev->bus->pm) {
goto End;
if (dev->bus->pm) {
pm_dev_dbg(dev, state, "EARLY "); pm_dev_dbg(dev, state, "EARLY ");
error = pm_noirq_op(dev, dev->bus->pm, state); error = pm_noirq_op(dev, dev->bus->pm, state);
} }
End:
TRACE_RESUME(error); TRACE_RESUME(error);
return error; return error;
} }
...@@ -615,10 +612,7 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state) ...@@ -615,10 +612,7 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
{ {
int error = 0; int error = 0;
if (!dev->bus) if (dev->bus && dev->bus->pm) {
return 0;
if (dev->bus->pm) {
pm_dev_dbg(dev, state, "LATE "); pm_dev_dbg(dev, state, "LATE ");
error = pm_noirq_op(dev, dev->bus->pm, state); error = pm_noirq_op(dev, dev->bus->pm, state);
} }
......
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