input: touch: atmel: Update Ftrace logging.
Vikas Jain [Fri, 18 Jan 2013 06:37:23 +0000 (11:37 +0530)]
Renamed touchscreen ftrace event to reflect
hardware module it is tracing. With this change,
each touchscreen hardware will have seperate
ftrace events.

Bug 1170830.

Change-Id: I45ffb3a264d958c9732d89bd2b5d4d62a9640267
Signed-off-by: Vikas Jain <vjain@nvidia.com>
Reviewed-on: http://git-master/r/192314
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

drivers/input/touchscreen/atmel_mxt_ts.c
include/trace/events/nvevent.h [deleted file]
include/trace/events/touchscreen_atmel.h [new file with mode: 0644]

index d287d4f..6a81a63 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2010 Samsung Electronics Co.Ltd
  * Copyright (C) 2011 Atmel Corporation
- * Copyright (C) 2011-2012 NVIDIA Corporation
+ * Copyright (C) 2011-2013 NVIDIA Corporation
  * Author: Joonyoung Shim <jy0922.shim@samsung.com>
  *
  * This program is free software; you can redistribute  it and/or modify it
@@ -25,7 +25,7 @@
 #include <linux/regulator/consumer.h>
 
 #define CREATE_TRACE_POINTS
-#include <trace/events/nvevent.h>
+#include <trace/events/touchscreen_atmel.h>
 
 /* Version */
 #define MXT_VER_20             20
@@ -1141,7 +1141,7 @@ update_count:
 static irqreturn_t mxt_interrupt(int irq, void *dev_id)
 {
        struct mxt_data *data = dev_id;
-       trace_nvevent_irq_data_read_start_series("Atmel_mxt_interrupt");
+       trace_touchscreen_atmel_irq("Atmel_mxt_interrupt");
        if (data->T44_address)
                return mxt_read_messages_t44(data);
        else
@@ -2586,7 +2586,7 @@ err_free_object:
 err_disable_regulator:
        regulator_disable(data->regulator_avdd);
        regulator_disable(data->regulator_vdd);
-err_free_data:
+
        kfree(data);
        return error;
 }
diff --git a/include/trace/events/nvevent.h b/include/trace/events/nvevent.h
deleted file mode 100644 (file)
index 3098712..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * include/trace/events/nvevent.h
- *
- * Input event logging to ftrace.
- *
- * Copyright (c) 2012, NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM nvevent
-
-#if !defined(_TRACE_NVEVENT_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_NVEVENT_H
-
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-TRACE_EVENT(nvevent_irq_data_read_start_series,
-       TP_PROTO(const char *name),
-       TP_ARGS(name),
-       TP_STRUCT__entry(
-               __field(const char *, name)
-       ),
-       TP_fast_assign(
-               __entry->name = name;
-       ),
-       TP_printk("name=%s",
-         __entry->name)
-);
-
-TRACE_EVENT(nvevent_irq_data_read_finish_series,
-       TP_PROTO(const char *name),
-       TP_ARGS(name),
-       TP_STRUCT__entry(
-               __field(const char *, name)
-       ),
-       TP_fast_assign(
-               __entry->name = name;
-       ),
-       TP_printk("name=%s",
-         __entry->name)
-);
-
-TRACE_EVENT(nvevent_irq_data_read_start_single,
-       TP_PROTO(const char *name),
-       TP_ARGS(name),
-       TP_STRUCT__entry(
-               __field(const char *, name)
-       ),
-       TP_fast_assign(
-               __entry->name = name;
-       ),
-       TP_printk("name=%s",
-         __entry->name)
-);
-
-TRACE_EVENT(nvevent_irq_data_read_finish_single,
-       TP_PROTO(const char *name),
-       TP_ARGS(name),
-       TP_STRUCT__entry(
-               __field(const char *, name)
-       ),
-       TP_fast_assign(
-               __entry->name = name;
-       ),
-       TP_printk("name=%s",
-         __entry->name)
-);
-
-TRACE_EVENT(nvevent_irq_data_submit,
-       TP_PROTO(const char *name),
-       TP_ARGS(name),
-       TP_STRUCT__entry(
-               __field(const char *, name)
-       ),
-       TP_fast_assign(
-               __entry->name = name;
-       ),
-       TP_printk("name=%s",
-         __entry->name)
-);
-
-#endif /*  _TRACE_NVEVENT_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>
diff --git a/include/trace/events/touchscreen_atmel.h b/include/trace/events/touchscreen_atmel.h
new file mode 100644 (file)
index 0000000..c3f6487
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * include/trace/events/touchscreen_atmel.h
+ *
+ * Atmel touchscreen event logging to ftrace.
+ *
+ * Copyright (c) 2012-2013, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM touchscreen_atmel
+
+#if !defined(_TRACE_TOUCHSCREEN_ATMEL_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TOUCHSCREEN_ATMEL_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(touchscreen_atmel_irq,
+       TP_PROTO(const char *name),
+       TP_ARGS(name),
+       TP_STRUCT__entry(
+               __field(const char *, name)
+       ),
+       TP_fast_assign(
+               __entry->name = name;
+       ),
+       TP_printk("name=%s",
+         __entry->name)
+);
+
+#endif /*  _TRACE_TOUCHSCREEN_ATMEL_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>