aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base/power')
-rw-r--r--drivers/base/power/resume.c7
-rw-r--r--drivers/base/power/suspend.c7
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 0c9610688542..00fd84ae6e66 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -29,13 +29,6 @@ int resume_device(struct device * dev)
29 29
30 down(&dev->sem); 30 down(&dev->sem);
31 31
32 if (dev->parent && dev->parent->power.power_state.event) {
33 dev_err(dev, "PM: resume from %d, parent %s still %d\n",
34 dev->power.power_state.event,
35 dev->parent->bus_id,
36 dev->parent->power.power_state.event);
37 }
38
39 if (dev->bus && dev->bus->resume) { 32 if (dev->bus && dev->bus->resume) {
40 dev_dbg(dev,"resuming\n"); 33 dev_dbg(dev,"resuming\n");
41 error = dev->bus->resume(dev); 34 error = dev->bus->resume(dev);
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index a3ff3944832a..26df9b231737 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -63,13 +63,6 @@ int suspend_device(struct device * dev, pm_message_t state)
63 dev_dbg(dev, "PM: suspend %d-->%d\n", 63 dev_dbg(dev, "PM: suspend %d-->%d\n",
64 dev->power.power_state.event, state.event); 64 dev->power.power_state.event, state.event);
65 } 65 }
66 if (dev->parent && dev->parent->power.power_state.event) {
67 dev_err(dev,
68 "PM: suspend %d->%d, parent %s already %d\n",
69 dev->power.power_state.event, state.event,
70 dev->parent->bus_id,
71 dev->parent->power.power_state.event);
72 }
73 66
74 if (dev->class && dev->class->suspend) { 67 if (dev->class && dev->class->suspend) {
75 suspend_device_dbg(dev, state, "class "); 68 suspend_device_dbg(dev, state, "class ");