regmap: Move tracing header into drivers/base/regmap

The tracing events for regmap are confined to the regmap subsystem. It
also requires accessing an internal header. Instead of including the
internal header from a generic file location, move the tracing file
into the regmap directory.

Also rename the regmap tracing header to trace.h, as it is redundant to
keep the regmap.h name when it is in the regmap directory.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Steven Rostedt 2015-03-19 17:50:47 -04:00 committed by Mark Brown
parent c6b570d97c
commit f58078daca
4 changed files with 12 additions and 3 deletions

View File

@ -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

View File

@ -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[] = {

View File

@ -20,7 +20,7 @@
#include <linux/sched.h>
#define CREATE_TRACE_POINTS
#include <trace/events/regmap.h>
#include "trace.h"
#include "internal.h"

View File

@ -7,7 +7,7 @@
#include <linux/ktime.h>
#include <linux/tracepoint.h>
#include "../../../drivers/base/regmap/internal.h"
#include "internal.h"
/*
* Log register events
@ -247,5 +247,11 @@ TRACE_EVENT(regcache_drop_region,
#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>