From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 24 Jun 2006 21:32:18 +0000 (-0700)
Subject: Enable minimal per-device resume tracing
X-Git-Tag: v2.6.18-rc1~1076
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d02f40e81e003be6ddba5c176f2e40ea290c3729;p=linux-2.6

Enable minimal per-device resume tracing

This is the minimal resume trace code to find which device resume (if
any) results in problems.  Usually, you'd use the information this
generates as a starting point to adding more fine-grained trace event
points.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 317edbf0fe..520679ce53 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/device.h>
+#include <linux/resume-trace.h>
 #include "../base.h"
 #include "power.h"
 
@@ -23,6 +24,8 @@ int resume_device(struct device * dev)
 {
 	int error = 0;
 
+	TRACE_DEVICE(dev);
+	TRACE_RESUME(0);
 	down(&dev->sem);
 	if (dev->power.pm_parent
 			&& dev->power.pm_parent->power.power_state.event) {
@@ -36,6 +39,7 @@ int resume_device(struct device * dev)
 		error = dev->bus->resume(dev);
 	}
 	up(&dev->sem);
+	TRACE_RESUME(error);
 	return error;
 }