Messages in this thread |  | | Date | Mon, 21 Nov 2011 18:24:07 +0530 | | From | "Srivatsa S. Bhat" <> | | Subject | Re: [PATCH] PM / Sleep: Remove unnecessary label and jumps to it form PM core code |
| |
On 11/20/2011 03:24 AM, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rjw@sisk.pl> > > 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>
Thanks, Srivatsa S. Bhat
> --- > drivers/base/power/main.c | 7 ------- > 1 file changed, 7 deletions(-) > > Index: linux/drivers/base/power/main.c > =================================================================== > --- linux.orig/drivers/base/power/main.c > +++ linux/drivers/base/power/main.c > @@ -1033,22 +1033,16 @@ static int device_prepare(struct device > 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 > suspend_report_result(dev->bus->pm->prepare, error); > } > > - End: > device_unlock(dev); > > return error;
|  |