Merge tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Pull regmap update from Mark Brown:
 "Just one patch for regmap this time around, a change from Steven
  Rostedt to prettify the way we're making the regmap internal header
  available to the trace events (it turns out that the trace subsystem
  doesn't actually need to be in trace/events)"

* tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Move tracing header into drivers/base/regmap

diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile
index 0a533653ef3bec4ea52d4883792eb4f587c7a78c..609e4c84f485b89ab0d219a3cfd06a2faf5a68ba 100644 (file)
--- a/drivers/base/regmap/Makefile
+++ b/drivers/base/regmap/Makefile
@@ -1,3 +1,6 @@
+# For include/trace/define_trace.h to include trace.h
+CFLAGS_regmap.o := -I$(src)
+
 obj-$(CONFIG_REGMAP) += regmap.o regcache.o
 obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
 obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 87db9893b463ba505acc3c28e253b5a08cf20c90..7eb7b3b98794849c6718c068504c7ac1acf3a2c9 100644 (file)
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -15,8 +15,8 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/sort.h>
-#include <trace/events/regmap.h>
 
+#include "trace.h"
 #include "internal.h"
 
 static const struct regcache_ops *cache_types[] = {

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index dbfe6a69c3daa67969df7c670f9e5144a053afb6..6273ff072f3eaa4cbd777b1a4f41fb3cf533a42a 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -20,7 +20,7 @@
 #include <linux/sched.h>
 
 #define CREATE_TRACE_POINTS
-#include <trace/events/regmap.h>
+#include "trace.h"
 
 #include "internal.h"
 

diff --git a/drivers/base/regmap/trace.h b/drivers/base/regmap/trace.h
new file mode 100644 (file)
index 0000000..64586a1
--- /dev/null
+++ b/drivers/base/regmap/trace.h
@@ -0,0 +1,257 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM regmap
+
+#if !defined(_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_REGMAP_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+#include "internal.h"
+
+/*
+ * Log register events
+ */
+DECLARE_EVENT_CLASS(regmap_reg,
+
+       TP_PROTO(struct regmap *map, unsigned int reg,
+                unsigned int val),
+
+       TP_ARGS(map, reg, val),
+
+       TP_STRUCT__entry(
+               __string(       name,           regmap_name(map)        )
+               __field(        unsigned int,   reg                     )
+               __field(        unsigned int,   val                     )
+       ),
+
+       TP_fast_assign(
+               __assign_str(name, regmap_name(map));
+               __entry->reg = reg;
+               __entry->val = val;
+       ),
+
+       TP_printk("%s reg=%x val=%x", __get_str(name),
+                 (unsigned int)__entry->reg,
+                 (unsigned int)__entry->val)
+);
+
+DEFINE_EVENT(regmap_reg, regmap_reg_write,
+
+       TP_PROTO(struct regmap *map, unsigned int reg,
+                unsigned int val),
+
+       TP_ARGS(map, reg, val)
+
+);
+
+DEFINE_EVENT(regmap_reg, regmap_reg_read,
+
+       TP_PROTO(struct regmap *map, unsigned int reg,
+                unsigned int val),
+
+       TP_ARGS(map, reg, val)
+
+);
+
+DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,
+
+       TP_PROTO(struct regmap *map, unsigned int reg,
+                unsigned int val),
+
+       TP_ARGS(map, reg, val)
+
+);
+
+DECLARE_EVENT_CLASS(regmap_block,
+
+       TP_PROTO(struct regmap *map, unsigned int reg, int count),
+
+       TP_ARGS(map, reg, count),
+
+       TP_STRUCT__entry(
+               __string(       name,           regmap_name(map)        )
+               __field(        unsigned int,   reg                     )
+               __field(        int,            count                   )
+       ),
+
+       TP_fast_assign(
+               __assign_str(name, regmap_name(map));
+               __entry->reg = reg;
+               __entry->count = count;
+       ),
+
+       TP_printk("%s reg=%x count=%d", __get_str(name),
+                 (unsigned int)__entry->reg,
+                 (int)__entry->count)
+);
+
+DEFINE_EVENT(regmap_block, regmap_hw_read_start,
+
+       TP_PROTO(struct regmap *map, unsigned int reg, int count),
+
+       TP_ARGS(map, reg, count)
+);
+
+DEFINE_EVENT(regmap_block, regmap_hw_read_done,
+
+       TP_PROTO(struct regmap *map, unsigned int reg, int count),
+
+       TP_ARGS(map, reg, count)
+);
+
+DEFINE_EVENT(regmap_block, regmap_hw_write_start,
+
+       TP_PROTO(struct regmap *map, unsigned int reg, int count),
+
+       TP_ARGS(map, reg, count)
+);
+
+DEFINE_EVENT(regmap_block, regmap_hw_write_done,
+
+       TP_PROTO(struct regmap *map, unsigned int reg, int count),
+
+       TP_ARGS(map, reg, count)
+);
+
+TRACE_EVENT(regcache_sync,
+
+       TP_PROTO(struct regmap *map, const char *type,
+                const char *status),
+
+       TP_ARGS(map, type, status),
+
+       TP_STRUCT__entry(
+               __string(       name,           regmap_name(map)        )
+               __string(       status,         status                  )
+               __string(       type,           type                    )
+               __field(        int,            type                    )
+       ),
+
+       TP_fast_assign(
+               __assign_str(name, regmap_name(map));
+               __assign_str(status, status);
+               __assign_str(type, type);
+       ),
+
+       TP_printk("%s type=%s status=%s", __get_str(name),
+                 __get_str(type), __get_str(status))
+);
+
+DECLARE_EVENT_CLASS(regmap_bool,
+
+       TP_PROTO(struct regmap *map, bool flag),
+
+       TP_ARGS(map, flag),
+
+       TP_STRUCT__entry(
+               __string(       name,           regmap_name(map)        )
+               __field(        int,            flag                    )
+       ),
+
+       TP_fast_assign(
+               __assign_str(name, regmap_name(map));
+               __entry->flag = flag;
+       ),
+
+       TP_printk("%s flag=%d", __get_str(name),
+                 (int)__entry->flag)
+);
+
+DEFINE_EVENT(regmap_bool, regmap_cache_only,
+
+       TP_PROTO(struct regmap *map, bool flag),
+
+       TP_ARGS(map, flag)
+
+);
+
+DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
+
+       TP_PROTO(struct regmap *map, bool flag),
+
+       TP_ARGS(map, flag)
+
+);
+
+DECLARE_EVENT_CLASS(regmap_async,
+
+       TP_PROTO(struct regmap *map),
+
+       TP_ARGS(map),
+
+       TP_STRUCT__entry(
+               __string(       name,           regmap_name(map)        )
+       ),
+
+       TP_fast_assign(
+               __assign_str(name, regmap_name(map));
+       ),
+
+       TP_printk("%s", __get_str(name))
+);
+
+DEFINE_EVENT(regmap_block, regmap_async_write_start,
+
+       TP_PROTO(struct regmap *map, unsigned int reg, int count),
+
+       TP_ARGS(map, reg, count)
+);
+
+DEFINE_EVENT(regmap_async, regmap_async_io_complete,
+
+       TP_PROTO(struct regmap *map),
+
+       TP_ARGS(map)
+
+);
+
+DEFINE_EVENT(regmap_async, regmap_async_complete_start,
+
+       TP_PROTO(struct regmap *map),
+
+       TP_ARGS(map)
+
+);
+
+DEFINE_EVENT(regmap_async, regmap_async_complete_done,
+
+       TP_PROTO(struct regmap *map),
+
+       TP_ARGS(map)
+
+);
+
+TRACE_EVENT(regcache_drop_region,
+
+       TP_PROTO(struct regmap *map, unsigned int from,
+                unsigned int to),
+
+       TP_ARGS(map, from, to),
+
+       TP_STRUCT__entry(
+               __string(       name,           regmap_name(map)        )
+               __field(        unsigned int,   from                    )
+               __field(        unsigned int,   to                      )
+       ),
+
+       TP_fast_assign(
+               __assign_str(name, regmap_name(map));
+               __entry->from = from;
+               __entry->to = to;
+       ),
+
+       TP_printk("%s %u-%u", __get_str(name), (unsigned int)__entry->from,
+                 (unsigned int)__entry->to)
+);
+
+#endif /* _TRACE_REGMAP_H */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE trace
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>

diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
deleted file mode 100644 (file)
index 22317d2..0000000
--- a/include/trace/events/regmap.h
+++ /dev/null
@@ -1,251 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM regmap
-
-#if !defined(_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_REGMAP_H
-
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-#include "../../../drivers/base/regmap/internal.h"
-
-/*
- * Log register events
- */
-DECLARE_EVENT_CLASS(regmap_reg,
-
-       TP_PROTO(struct regmap *map, unsigned int reg,
-                unsigned int val),
-
-       TP_ARGS(map, reg, val),
-
-       TP_STRUCT__entry(
-               __string(       name,           regmap_name(map)        )
-               __field(        unsigned int,   reg                     )
-               __field(        unsigned int,   val                     )
-       ),
-
-       TP_fast_assign(
-               __assign_str(name, regmap_name(map));
-               __entry->reg = reg;
-               __entry->val = val;
-       ),
-
-       TP_printk("%s reg=%x val=%x", __get_str(name),
-                 (unsigned int)__entry->reg,
-                 (unsigned int)__entry->val)
-);
-
-DEFINE_EVENT(regmap_reg, regmap_reg_write,
-
-       TP_PROTO(struct regmap *map, unsigned int reg,
-                unsigned int val),
-
-       TP_ARGS(map, reg, val)
-
-);
-
-DEFINE_EVENT(regmap_reg, regmap_reg_read,
-
-       TP_PROTO(struct regmap *map, unsigned int reg,
-                unsigned int val),
-
-       TP_ARGS(map, reg, val)
-
-);
-
-DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,
-
-       TP_PROTO(struct regmap *map, unsigned int reg,
-                unsigned int val),
-
-       TP_ARGS(map, reg, val)
-
-);
-
-DECLARE_EVENT_CLASS(regmap_block,
-
-       TP_PROTO(struct regmap *map, unsigned int reg, int count),
-
-       TP_ARGS(map, reg, count),
-
-       TP_STRUCT__entry(
-               __string(       name,           regmap_name(map)        )
-               __field(        unsigned int,   reg                     )
-               __field(        int,            count                   )
-       ),
-
-       TP_fast_assign(
-               __assign_str(name, regmap_name(map));
-               __entry->reg = reg;
-               __entry->count = count;
-       ),
-
-       TP_printk("%s reg=%x count=%d", __get_str(name),
-                 (unsigned int)__entry->reg,
-                 (int)__entry->count)
-);
-
-DEFINE_EVENT(regmap_block, regmap_hw_read_start,
-
-       TP_PROTO(struct regmap *map, unsigned int reg, int count),
-
-       TP_ARGS(map, reg, count)
-);
-
-DEFINE_EVENT(regmap_block, regmap_hw_read_done,
-
-       TP_PROTO(struct regmap *map, unsigned int reg, int count),
-
-       TP_ARGS(map, reg, count)
-);
-
-DEFINE_EVENT(regmap_block, regmap_hw_write_start,
-
-       TP_PROTO(struct regmap *map, unsigned int reg, int count),
-
-       TP_ARGS(map, reg, count)
-);
-
-DEFINE_EVENT(regmap_block, regmap_hw_write_done,
-
-       TP_PROTO(struct regmap *map, unsigned int reg, int count),
-
-       TP_ARGS(map, reg, count)
-);
-
-TRACE_EVENT(regcache_sync,
-
-       TP_PROTO(struct regmap *map, const char *type,
-                const char *status),
-
-       TP_ARGS(map, type, status),
-
-       TP_STRUCT__entry(
-               __string(       name,           regmap_name(map)        )
-               __string(       status,         status                  )
-               __string(       type,           type                    )
-               __field(        int,            type                    )
-       ),
-
-       TP_fast_assign(
-               __assign_str(name, regmap_name(map));
-               __assign_str(status, status);
-               __assign_str(type, type);
-       ),
-
-       TP_printk("%s type=%s status=%s", __get_str(name),
-                 __get_str(type), __get_str(status))
-);
-
-DECLARE_EVENT_CLASS(regmap_bool,
-
-       TP_PROTO(struct regmap *map, bool flag),
-
-       TP_ARGS(map, flag),
-
-       TP_STRUCT__entry(
-               __string(       name,           regmap_name(map)        )
-               __field(        int,            flag                    )
-       ),
-
-       TP_fast_assign(
-               __assign_str(name, regmap_name(map));
-               __entry->flag = flag;
-       ),
-
-       TP_printk("%s flag=%d", __get_str(name),
-                 (int)__entry->flag)
-);
-
-DEFINE_EVENT(regmap_bool, regmap_cache_only,
-
-       TP_PROTO(struct regmap *map, bool flag),
-
-       TP_ARGS(map, flag)
-
-);
-
-DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
-
-       TP_PROTO(struct regmap *map, bool flag),
-
-       TP_ARGS(map, flag)
-
-);
-
-DECLARE_EVENT_CLASS(regmap_async,
-
-       TP_PROTO(struct regmap *map),
-
-       TP_ARGS(map),
-
-       TP_STRUCT__entry(
-               __string(       name,           regmap_name(map)        )
-       ),
-
-       TP_fast_assign(
-               __assign_str(name, regmap_name(map));
-       ),
-
-       TP_printk("%s", __get_str(name))
-);
-
-DEFINE_EVENT(regmap_block, regmap_async_write_start,
-
-       TP_PROTO(struct regmap *map, unsigned int reg, int count),
-
-       TP_ARGS(map, reg, count)
-);
-
-DEFINE_EVENT(regmap_async, regmap_async_io_complete,
-
-       TP_PROTO(struct regmap *map),
-
-       TP_ARGS(map)
-
-);
-
-DEFINE_EVENT(regmap_async, regmap_async_complete_start,
-
-       TP_PROTO(struct regmap *map),
-
-       TP_ARGS(map)
-
-);
-
-DEFINE_EVENT(regmap_async, regmap_async_complete_done,
-
-       TP_PROTO(struct regmap *map),
-
-       TP_ARGS(map)
-
-);
-
-TRACE_EVENT(regcache_drop_region,
-
-       TP_PROTO(struct regmap *map, unsigned int from,
-                unsigned int to),
-
-       TP_ARGS(map, from, to),
-
-       TP_STRUCT__entry(
-               __string(       name,           regmap_name(map)        )
-               __field(        unsigned int,   from                    )
-               __field(        unsigned int,   to                      )
-       ),
-
-       TP_fast_assign(
-               __assign_str(name, regmap_name(map));
-               __entry->from = from;
-               __entry->to = to;
-       ),
-
-       TP_printk("%s %u-%u", __get_str(name), (unsigned int)__entry->from,
-                 (unsigned int)__entry->to)
-);
-
-#endif /* _TRACE_REGMAP_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>