From 48c595c9ec613ea2be843e7c8e124a5c0ba50ca6 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 8 Jan 2010 14:42:57 -0800 Subject: [PATCH] --- yaml --- r: 178943 b: refs/heads/master c: 0a88422312f5bf7b9e3450e27d8ddc385af38789 h: refs/heads/master i: 178941: 4fa53d8aa6f079b15624a3df9816c1dfc2119fac 178939: 5ba6d133ce1c376c16b73f6158100dead0a576cc 178935: e27185d73e4108ee0be7afffe52cdcd129457c0a 178927: ec8c0f9026b6861fff893eb727eb5bd1eb5cfef4 178911: 7c0ccbf5e079c278433b416a32a1fa2daea99adf 178879: f3f9c9a82fc634754e957d43d183b76a2e728e01 178815: 11c0afa984f6064b2408a556028f8b0292be26cf 178687: 59a534c09e6bfc091b6e731a40c698964ea8e259 v: v3 --- [refs] | 2 +- trunk/drivers/base/power/main.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2990afd730b5..1f809e573e8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1306d603fcf1f6682f8575d1ff23631a24184b21 +refs/heads/master: 0a88422312f5bf7b9e3450e27d8ddc385af38789 diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c index 48adf80926a0..a5142bddef41 100644 --- a/trunk/drivers/base/power/main.c +++ b/trunk/drivers/base/power/main.c @@ -446,8 +446,8 @@ EXPORT_SYMBOL_GPL(dpm_resume_noirq); /** * legacy_resume - Execute a legacy (bus or class) resume callback for device. - * dev: Device to resume. - * cb: Resume callback to execute. + * @dev: Device to resume. + * @cb: Resume callback to execute. */ static int legacy_resume(struct device *dev, int (*cb)(struct device *dev)) { @@ -711,8 +711,9 @@ EXPORT_SYMBOL_GPL(dpm_suspend_noirq); /** * legacy_suspend - Execute a legacy (bus or class) suspend callback for device. - * dev: Device to suspend. - * cb: Suspend callback to execute. + * @dev: Device to suspend. + * @state: PM transition of the system being carried out. + * @cb: Suspend callback to execute. */ static int legacy_suspend(struct device *dev, pm_message_t state, int (*cb)(struct device *dev, pm_message_t state))