---

yaml --- r: 59105 b: refs/heads/master c: 43a49f8 h: refs/heads/master i: 59103: e33a4e4 v: v3
git-mirror · Jul 11, 2007 · 279a726 · 279a726
1 parent e2e1037
commit 279a726
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c3f7d1c79425dd8f627b8da139fd1855f096b6e
+refs/heads/master: 43a49f8baa6b0e7e5b68ed0ee141e1efacfd9ae6
diff --git a/trunk/drivers/base/power/resume.c b/trunk/drivers/base/power/resume.c
@@ -29,13 +29,6 @@ int resume_device(struct device * dev)
 
 	down(&dev->sem);
 
-	if (dev->parent && dev->parent->power.power_state.event) {
-		dev_err(dev, "PM: resume from %d, parent %s still %d\n",
-			dev->power.power_state.event,
-			dev->parent->bus_id,
-			dev->parent->power.power_state.event);
-	}
-
 	if (dev->bus && dev->bus->resume) {
 		dev_dbg(dev,"resuming\n");
 		error = dev->bus->resume(dev);

diff --git a/trunk/drivers/base/power/suspend.c b/trunk/drivers/base/power/suspend.c
@@ -63,13 +63,6 @@ int suspend_device(struct device * dev, pm_message_t state)
 		dev_dbg(dev, "PM: suspend %d-->%d\n",
 			dev->power.power_state.event, state.event);
 	}
-	if (dev->parent && dev->parent->power.power_state.event) {
-		dev_err(dev,
-			"PM: suspend %d->%d, parent %s already %d\n",
-			dev->power.power_state.event, state.event,
-			dev->parent->bus_id,
-			dev->parent->power.power_state.event);
-	}
 
 	if (dev->class && dev->class->suspend) {
 		suspend_device_dbg(dev, state, "class ");