From 1a1783733745c533ff2255c265ce04f0e24f668a Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 16 May 2006 17:03:25 -0700 Subject: [PATCH] --- yaml --- r: 28294 b: refs/heads/master c: fd869db6eb1ea0ffe251e53a113dbf259400f4f6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/power/suspend.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e4594e4eba22..20c691868db0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e724845034eb898c97dc6636207f0a231af9432 +refs/heads/master: fd869db6eb1ea0ffe251e53a113dbf259400f4f6 diff --git a/trunk/drivers/base/power/suspend.c b/trunk/drivers/base/power/suspend.c index 2a769cc6f5f9..1a1fe43a3057 100644 --- a/trunk/drivers/base/power/suspend.c +++ b/trunk/drivers/base/power/suspend.c @@ -29,6 +29,15 @@ * lists. This way, the ancestors will be accessed before their descendents. */ +static inline char *suspend_verb(u32 event) +{ + switch (event) { + case PM_EVENT_SUSPEND: return "suspend"; + case PM_EVENT_FREEZE: return "freeze"; + default: return "(unknown suspend event)"; + } +} + /** * suspend_device - Save state of one device. @@ -57,7 +66,13 @@ int suspend_device(struct device * dev, pm_message_t state) dev->power.prev_state = dev->power.power_state; if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) { - dev_dbg(dev, "suspending\n"); + dev_dbg(dev, "%s%s\n", + suspend_verb(state.event), + ((state.event == PM_EVENT_SUSPEND) + && device_may_wakeup(dev)) + ? ", may wakeup" + : "" + ); error = dev->bus->suspend(dev, state); suspend_report_result(dev->bus->suspend, error); }