diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-13 20:31:12 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-15 20:42:06 +0100 |
| commit | 33c3374031facf7599c30a1548dfa4c83da87da3 (patch) | |
| tree | a13c07cf40f4a6d26236c4ec97420f4854f91fca | |
| parent | f2511774863487e61b56a97da07ebf8dd61d7836 (diff) | |
| download | op-kernel-dev-33c3374031facf7599c30a1548dfa4c83da87da3.zip op-kernel-dev-33c3374031facf7599c30a1548dfa4c83da87da3.tar.gz | |
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: Rafael J. Wysocki <rjw@sisk.pl>
| -rw-r--r-- | drivers/base/power/main.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 30f0cee..df04cb4 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -372,14 +372,11 @@ static int device_resume_noirq(struct device *dev, pm_message_t state) TRACE_DEVICE(dev); TRACE_RESUME(0); - if (!dev->bus) - goto End; - - if (dev->bus->pm) { + if (dev->bus && dev->bus->pm) { pm_dev_dbg(dev, state, "EARLY "); error = pm_noirq_op(dev, dev->bus->pm, state); } - End: + TRACE_RESUME(error); return error; } @@ -615,10 +612,7 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state) { int error = 0; - if (!dev->bus) - return 0; - - if (dev->bus->pm) { + if (dev->bus && dev->bus->pm) { pm_dev_dbg(dev, state, "LATE "); error = pm_noirq_op(dev, dev->bus->pm, state); } |
