[PATCH] tracing: Remove the stale include/trace/power.h

[PATCH] tracing: Remove the stale include/trace/power.h

[Josh Stone]

Commit 6161352 moved the power tracing to include/trace/events/, but
left the old header behind.  No one is using the old header, and its
declarations are now incorrect, so it should be removed.

Signed-off-by: Josh Stone <jistone@redhat.com>
Cc: "Frank Ch. Eigler" <fche@redhat.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
---
 include/trace/power.h |   32 --------------------------------
 1 files changed, 0 insertions(+), 32 deletions(-)
 delete mode 100644 include/trace/power.h

diff --git a/include/trace/power.h b/include/trace/power.h
deleted file mode 100644
index ef20466..0000000
--- a/include/trace/power.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _TRACE_POWER_H
-#define _TRACE_POWER_H
-
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-enum {
-	POWER_NONE = 0,
-	POWER_CSTATE = 1,
-	POWER_PSTATE = 2,
-};
-
-struct power_trace {
-	ktime_t			stamp;
-	ktime_t			end;
-	int			type;
-	int			state;
-};
-
-DECLARE_TRACE(power_start,
-	TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
-	      TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_mark,
-	TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
-	      TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_end,
-	TP_PROTO(struct power_trace *it),
-	      TP_ARGS(it));
-
-#endif /* _TRACE_POWER_H */
-- 
1.6.5.2

Re: [PATCH] tracing: Remove the stale include/trace/power.h

[Arjan van de Ven]

Josh Stone wrote:
> Commit 6161352 moved the power tracing to include/trace/events/, but
> left the old header behind.  No one is using the old header, and its
> declarations are now incorrect, so it should be removed.
> 

hmm I could have sworn my patch did that... it was supposed to

Acked-by: Arjan van de Ven <arjan@linux.intel.com>

/

Re: [PATCH] tracing: Remove the stale include/trace/power.h

[Frederic Weisbecker]

On Wed, Nov 18, 2009 at 01:06:55PM -0800, Josh Stone wrote:
> Commit 6161352 moved the power tracing to include/trace/events/, but
> left the old header behind.  No one is using the old header, and its
> declarations are now incorrect, so it should be removed.
> 
> Signed-off-by: Josh Stone <jistone@redhat.com>
> Cc: "Frank Ch. Eigler" <fche@redhat.com>
> Cc: Arjan van de Ven <arjan@linux.intel.com>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Ingo Molnar <mingo@elte.hu>
> ---



Yep, it has been completely replaced by the trace event version.
I guess we should take this one for .33

Thanks!

[tip:tracing/core] tracing: Remove the stale include/trace/power.h

[tip-bot for Josh Stone]

Commit-ID:  192dcf1d1775736627280a5dd4cb0f605b21857a
Gitweb:     http://git.kernel.org/tip/192dcf1d1775736627280a5dd4cb0f605b21857a
Author:     Josh Stone <jistone@redhat.com>
AuthorDate: Wed, 18 Nov 2009 13:06:55 -0800
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 19 Nov 2009 05:38:40 +0100

tracing: Remove the stale include/trace/power.h

Commit 6161352 moved the power tracing to include/trace/events/,
but left the old header behind.  No one is using the old header,
and its declarations are now incorrect, so it should be removed.

Signed-off-by: Josh Stone <jistone@redhat.com>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <1258578415-14752-1-git-send-email-jistone@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 include/trace/power.h |   32 --------------------------------
 1 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/include/trace/power.h b/include/trace/power.h
deleted file mode 100644
index ef20466..0000000
--- a/include/trace/power.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _TRACE_POWER_H
-#define _TRACE_POWER_H
-
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-enum {
-	POWER_NONE = 0,
-	POWER_CSTATE = 1,
-	POWER_PSTATE = 2,
-};
-
-struct power_trace {
-	ktime_t			stamp;
-	ktime_t			end;
-	int			type;
-	int			state;
-};
-
-DECLARE_TRACE(power_start,
-	TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
-	      TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_mark,
-	TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
-	      TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_end,
-	TP_PROTO(struct power_trace *it),
-	      TP_ARGS(it));
-
-#endif /* _TRACE_POWER_H */