* [PATCH] PM / Sleep: Simplify device_suspend_noirq()
@ 2011-11-19 22:43 Rafael J. Wysocki
2011-11-21 12:47 ` Srivatsa S. Bhat
0 siblings, 1 reply; 2+ messages in thread
From: Rafael J. Wysocki @ 2011-11-19 22:43 UTC (permalink / raw)
To: Linux PM list; +Cc: LKML
From: Rafael J. Wysocki <rjw@sisk.pl>
Remove a few if () and return statements in device_suspend_noirq()
that aren't really necessary.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/base/power/main.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
Index: linux/drivers/base/power/main.c
===================================================================
--- linux.orig/drivers/base/power/main.c
+++ linux/drivers/base/power/main.c
@@ -763,31 +763,23 @@ static pm_message_t resume_event(pm_mess
*/
static int device_suspend_noirq(struct device *dev, pm_message_t state)
{
- int error;
+ int error = 0;
if (dev->pm_domain) {
pm_dev_dbg(dev, state, "LATE power domain ");
error = pm_noirq_op(dev, &dev->pm_domain->ops, state);
- if (error)
- return error;
} else if (dev->type && dev->type->pm) {
pm_dev_dbg(dev, state, "LATE type ");
error = pm_noirq_op(dev, dev->type->pm, state);
- if (error)
- return error;
} else if (dev->class && dev->class->pm) {
pm_dev_dbg(dev, state, "LATE class ");
error = pm_noirq_op(dev, dev->class->pm, state);
- if (error)
- return error;
} else if (dev->bus && dev->bus->pm) {
pm_dev_dbg(dev, state, "LATE ");
error = pm_noirq_op(dev, dev->bus->pm, state);
- if (error)
- return error;
}
- return 0;
+ return error;
}
/**
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] PM / Sleep: Simplify device_suspend_noirq()
2011-11-19 22:43 [PATCH] PM / Sleep: Simplify device_suspend_noirq() Rafael J. Wysocki
@ 2011-11-21 12:47 ` Srivatsa S. Bhat
0 siblings, 0 replies; 2+ messages in thread
From: Srivatsa S. Bhat @ 2011-11-21 12:47 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM list, LKML
On 11/20/2011 04:13 AM, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> Remove a few if () and return statements in device_suspend_noirq()
> that aren't really necessary.
>
> 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 | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> Index: linux/drivers/base/power/main.c
> ===================================================================
> --- linux.orig/drivers/base/power/main.c
> +++ linux/drivers/base/power/main.c
> @@ -763,31 +763,23 @@ static pm_message_t resume_event(pm_mess
> */
> static int device_suspend_noirq(struct device *dev, pm_message_t state)
> {
> - int error;
> + int error = 0;
>
> if (dev->pm_domain) {
> pm_dev_dbg(dev, state, "LATE power domain ");
> error = pm_noirq_op(dev, &dev->pm_domain->ops, state);
> - if (error)
> - return error;
> } else if (dev->type && dev->type->pm) {
> pm_dev_dbg(dev, state, "LATE type ");
> error = pm_noirq_op(dev, dev->type->pm, state);
> - if (error)
> - return error;
> } else if (dev->class && dev->class->pm) {
> pm_dev_dbg(dev, state, "LATE class ");
> error = pm_noirq_op(dev, dev->class->pm, state);
> - if (error)
> - return error;
> } else if (dev->bus && dev->bus->pm) {
> pm_dev_dbg(dev, state, "LATE ");
> error = pm_noirq_op(dev, dev->bus->pm, state);
> - if (error)
> - return error;
> }
>
> - return 0;
> + return error;
> }
>
> /**
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-21 12:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-19 22:43 [PATCH] PM / Sleep: Simplify device_suspend_noirq() Rafael J. Wysocki
2011-11-21 12:47 ` 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