Re: [PATCH] PM / Sleep: Simplify device_suspend_noirq()

["Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>]

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;
>  }
> 
>  /**