PM / Sleep: Remove unnecessary label and jumps to it form PM core code
Subsystems (4)
PATCH 1/1 PM / Sleep: Remove unnecessary label and jumps to it form PM core code
From: Rafael J. Wysocki <[email protected]>
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 <[email protected]>
--- drivers/base/power/main.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/base/power/main.c +0 -7
@@ -1033,22 +1033,16 @@ static int device_prepare(struct deviceif (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 devicesuspend_report_result (dev->bus->pm->prepare, error); } - End:device_unlock (dev);return error;
Quoted 7 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
The "End" label in
device_prepare()indrivers/base/power/main.cis not necessary and the jumps to it have no real effect, so remove them all.Signed-off-by Rafael J. Wysocki <[email protected]>
Reviewed-by Srivatsa S. Bhat <[email protected]>
Thanks,
Srivatsa S. Bhat
Quoted 39 lines
--- drivers/base/power/main.c | 7 ------- 1 file changed, 7 deletions(-)Index:
linux/drivers/base/power/main.c
===================================================================drivers/base/power/main.c +0
-7@@ -1033,22 +1033,16 @@ static int device_prepare(struct deviceif (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 devicesuspend_report_result (dev->bus->pm->prepare, error); } - End:device_unlock (dev);return error;