diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-11-21 23:33:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-11-23 21:13:24 +0100 |
| commit | d74e278aaf3b0fe4b02af67055aa71babcc0cebe (patch) | |
| tree | 2dc1f9986c130da90578c7acb265aed4e4bbc850 | |
| parent | 6a76b7a9cc93dec6ae58d70f1257d234291908e0 (diff) | |
| download | op-kernel-dev-d74e278aaf3b0fe4b02af67055aa71babcc0cebe.zip op-kernel-dev-d74e278aaf3b0fe4b02af67055aa71babcc0cebe.tar.gz | |
PM / Sleep: Remove unnecessary label and jumps to it form PM core code
The "End" label in device_prepare() in drivers/base/power/main.c is
not necessary and the jumps to it have no real effect, so remove them
all.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
| -rw-r--r-- | drivers/base/power/main.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index c3d2dfc..1172aea 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1033,22 +1033,16 @@ static int device_prepare(struct device *dev, pm_message_t state) if (dev->pm_domain->ops.prepare) error = dev->pm_domain->ops.prepare(dev); suspend_report_result(dev->pm_domain->ops.prepare, error); - if (error) - goto End; } else if (dev->type && dev->type->pm) { pm_dev_dbg(dev, state, "preparing type "); if (dev->type->pm->prepare) error = dev->type->pm->prepare(dev); suspend_report_result(dev->type->pm->prepare, error); - if (error) - goto End; } else if (dev->class && dev->class->pm) { pm_dev_dbg(dev, state, "preparing class "); if (dev->class->pm->prepare) error = dev->class->pm->prepare(dev); suspend_report_result(dev->class->pm->prepare, error); - if (error) - goto End; } else if (dev->bus && dev->bus->pm) { pm_dev_dbg(dev, state, "preparing "); if (dev->bus->pm->prepare) @@ -1056,7 +1050,6 @@ static int device_prepare(struct device *dev, pm_message_t state) suspend_report_result(dev->bus->pm->prepare, error); } - End: device_unlock(dev); return error; |
