From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751454Ab1JLDyH (ORCPT ); Tue, 11 Oct 2011 23:54:07 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:59618 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750959Ab1JLDyG (ORCPT ); Tue, 11 Oct 2011 23:54:06 -0400 From: ming.lei@canonical.com To: rjw@sisk.pl Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Ming Lei Subject: [PATCH 1/2] PM/runtime: fix comment for rpm_suspend Date: Wed, 12 Oct 2011 11:53:32 +0800 Message-Id: <1318391613-24364-1-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.5.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ming Lei 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 --- 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. */ -- 1.7.5.4