aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2011-10-11 23:53:32 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2011-10-16 17:25:08 -0400
commit47d8f0bac0fda4c15a030f92cd6da6c6bed87459 (patch)
tree57b4078eac2bd58b412ca09bc47f2827050cf47e /drivers/base/power
parent2fb242adcaab5defa2f208775ac4f181ac998fdd (diff)
PM / Runtime: Fix kerneldoc comment for rpm_suspend()
This patch fix kerneldoc comments for rpm_suspend(): - 'Cancel a pending idle notification' should be put before, also should be changed to 'Cancel a pending idle notification, autosuspend or suspend'. - idle notification for the device after succeeding suspend has been removed, so update the comment accordingly. [rjw: Modified the subject and changelog slightly.] Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base/power')
-rw-r--r--drivers/base/power/runtime.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 7a6fb5e34a0e..aa23a64ea33b 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)
286 * @dev: Device to suspend. 286 * @dev: Device to suspend.
287 * @rpmflags: Flag bits. 287 * @rpmflags: Flag bits.
288 * 288 *
289 * Check if the device's runtime PM status allows it to be suspended. If 289 * Check if the device's runtime PM status allows it to be suspended.
290 * another suspend has been started earlier, either return immediately or wait 290 * Cancel a pending idle notification, autosuspend or suspend. If
291 * for it to finish, depending on the RPM_NOWAIT and RPM_ASYNC flags. Cancel a 291 * another suspend has been started earlier, either return immediately
292 * pending idle notification. If the RPM_ASYNC flag is set then queue a 292 * or wait for it to finish, depending on the RPM_NOWAIT and RPM_ASYNC
293 * suspend request; otherwise run the ->runtime_suspend() callback directly. 293 * flags. If the RPM_ASYNC flag is set then queue a suspend request;
294 * If a deferred resume was requested while the callback was running then carry 294 * otherwise run the ->runtime_suspend() callback directly. If a deferred
295 * it out; otherwise send an idle notification for the device (if the suspend 295 * resume was requested while the callback was running then carry it out;
296 * failed) or for its parent (if the suspend succeeded). 296 * otherwise send an idle notification for its parent (if the suspend
297 * succeeded and both ignore_children of parent->power and irq_safe of
298 * dev->power are not set).
297 * 299 *
298 * This function must be called under dev->power.lock with interrupts disabled. 300 * This function must be called under dev->power.lock with interrupts disabled.
299 */ 301 */