Re: [PATCH 1/2] PM/runtime: fix comment for rpm_suspend

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Wednesday, October 12, 2011, ming.lei@canonical.com wrote:
> From: Ming Lei <ming.lei@canonical.com>
> 
> This patch fix comments for rpm_suspend:
> 
> - 'Cancel a pending idle notification' should be put before, also
> should be changed as 'Cancel a pending idle notification,
> autosuspend or suspend'
> 
> - after suspend succeeded, idle notification for the device has
> been removed, so update comment for it
> 
> Signed-off-by: Ming Lei <ming.lei@canonical.com>

Both patches applied to linux-pm/linux-next.

Thanks,
Rafael


> ---
>  drivers/base/power/runtime.c |   18 ++++++++++--------
>  1 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
> index 7a6fb5e..aa23a64 100644
> --- a/drivers/base/power/runtime.c
> +++ b/drivers/base/power/runtime.c
> @@ -286,14 +286,16 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev)
>   * @dev: Device to suspend.
>   * @rpmflags: Flag bits.
>   *
> - * Check if the device's runtime PM status allows it to be suspended.  If
> - * another suspend has been started earlier, either return immediately or wait
> - * for it to finish, depending on the RPM_NOWAIT and RPM_ASYNC flags.  Cancel a
> - * pending idle notification.  If the RPM_ASYNC flag is set then queue a
> - * suspend request; otherwise run the ->runtime_suspend() callback directly.
> - * If a deferred resume was requested while the callback was running then carry
> - * it out; otherwise send an idle notification for the device (if the suspend
> - * failed) or for its parent (if the suspend succeeded).
> + * Check if the device's runtime PM status allows it to be suspended.
> + * Cancel a pending idle notification, autosuspend or suspend. If
> + * another suspend has been started earlier, either return immediately
> + * or wait for it to finish, depending on the RPM_NOWAIT and RPM_ASYNC
> + * flags. If the RPM_ASYNC flag is set then queue a suspend request;
> + * otherwise run the ->runtime_suspend() callback directly. If a deferred
> + * resume was requested while the callback was running then carry it out;
> + * otherwise send an idle notification for its parent (if the suspend
> + * succeeded and both ignore_children of parent->power and irq_safe of
> + * dev->power are not set).
>   *
>   * This function must be called under dev->power.lock with interrupts disabled.
>   */
>