[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4ECA49EF.4000400@linux.vnet.ibm.com>
Date: Mon, 21 Nov 2011 18:24:07 +0530
From: "Srivatsa S. Bhat" <srivatsa.bhat@...ux.vnet.ibm.com>
To: "Rafael J. Wysocki" <rjw@...k.pl>
CC: Linux PM list <linux-pm@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>
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@...k.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@...k.pl>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@...ux.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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists