ext4: fix tracepoint format string warnings

[safe/jmp/linux-2.6] / include / trace / power.h

diff --git a/include/trace/power.h b/include/trace/power.h
index 2c733e5..ef20466 100644 (file)
--- a/include/trace/power.h
+++ b/include/trace/power.h
@@ -11,24 +11,22 @@ enum {
 };
 
 struct power_trace {
-#ifdef CONFIG_POWER_TRACER
        ktime_t                 stamp;
        ktime_t                 end;
        int                     type;
        int                     state;
-#endif
 };
 
 DECLARE_TRACE(power_start,
-       TPPROTO(struct power_trace *it, unsigned int type, unsigned int state),
-               TPARGS(it, type, state));
+       TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
+             TP_ARGS(it, type, state));
 
 DECLARE_TRACE(power_mark,
-       TPPROTO(struct power_trace *it, unsigned int type, unsigned int state),
-               TPARGS(it, type, state));
+       TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
+             TP_ARGS(it, type, state));
 
 DECLARE_TRACE(power_end,
-       TPPROTO(struct power_trace *it),
-               TPARGS(it));
+       TP_PROTO(struct power_trace *it),
+             TP_ARGS(it));
 
 #endif /* _TRACE_POWER_H */