* [PATCH] PM / Sleep: Remove unnecessary label and jumps to it form PM core code
@ 2011-11-19 21:54 Rafael J. Wysocki
2011-11-21 12:54 ` Srivatsa S. Bhat
0 siblings, 1 reply; 2+ messages in thread
From: Rafael J. Wysocki @ 2011-11-19 21:54 UTC (permalink / raw)
To: Linux PM list; +Cc: LKML
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>
---
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] PM / Sleep: Remove unnecessary label and jumps to it form PM core code
2011-11-19 21:54 [PATCH] PM / Sleep: Remove unnecessary label and jumps to it form PM core code Rafael J. Wysocki
@ 2011-11-21 12:54 ` Srivatsa S. Bhat
0 siblings, 0 replies; 2+ messages in thread
From: Srivatsa S. Bhat @ 2011-11-21 12:54 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM list, LKML
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-21 12:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-19 21:54 [PATCH] PM / Sleep: Remove unnecessary label and jumps to it form PM core code Rafael J. Wysocki
2011-11-21 12:54 ` Srivatsa S. Bhat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox