On Mon, 9 Mar 2015 12:20:13 +0100
Philipp Zabel <p.za...@pengutronix.de> wrote:
Sorry for the late repy, I just noticed this email.
> diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
> index 23d5615..22317d2 100644
> --- a/include/trace/events/regmap.h
> +++ b/include/trace/events/regmap.h
> @@ -7,27 +7,26 @@
> #include <linux/ktime.h>
> #include <linux/tracepoint.h>
>
> -struct device;
> -struct regmap;
> +#include "../../../drivers/base/regmap/internal.h"
Ouch, that is nasty!
Can we move this regmap.h file into drivers/base/regmap/ directory.
The trace_event sample code in samples/trace_events/ explains how to do
that, but for those that are too lazy to read that, I'll explain it here
too ;-)
In drivers/base/regmap/Makefile, add:
CFLAGS_regmap.o = -I$(src)
Then in this header file add at the bottom just before the include of
trace/define_trace.h:
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
Note, if you want to rename this file to something like regmap_trace.h,
then you also need to add:
#undef TRACE_INCLUDE_FILE
#define TRACE_INCLUDE_FILE regmap_trace
And it should all work out. Then you don't need that ugly include and
you can just add:
#include "internal.h"
-- Steve
>
> /*
> * Log register events
> */
> DECLARE_EVENT_CLASS(regmap_reg,
>
> - TP_PROTO(struct device *dev, unsigned int reg,
> + TP_PROTO(struct regmap *map, unsigned int reg,
> unsigned int val),
>
> - TP_ARGS(dev, reg, val),
> + TP_ARGS(map, reg, val),
>
> TP_STRUCT__entry(
> - __string( name, dev_name(dev) )
> - __field( unsigned int, reg )
> - __field( unsigned int, val )
> + __string( name, regmap_name(map) )
> + __field( unsigned int, reg )
> + __field( unsigned int, val )
> ),
>
> TP_fast_assign(
> - __assign_str(name, dev_name(dev));
> + __assign_str(name, regmap_name(map));
> __entry->reg = reg;
> __entry->val = val;
> ),
> @@ -39,45 +38,45 @@ DECLARE_EVENT_CLASS(regmap_reg,
>
> DEFINE_EVENT(regmap_reg, regmap_reg_write,
>
> - TP_PROTO(struct device *dev, unsigned int reg,
> + TP_PROTO(struct regmap *map, unsigned int reg,
> unsigned int val),
>
> - TP_ARGS(dev, reg, val)
> + TP_ARGS(map, reg, val)
>
> );
>
> DEFINE_EVENT(regmap_reg, regmap_reg_read,
>
> - TP_PROTO(struct device *dev, unsigned int reg,
> + TP_PROTO(struct regmap *map, unsigned int reg,
> unsigned int val),
>
> - TP_ARGS(dev, reg, val)
> + TP_ARGS(map, reg, val)
>
> );
>
> DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,
>
> - TP_PROTO(struct device *dev, unsigned int reg,
> + TP_PROTO(struct regmap *map, unsigned int reg,
> unsigned int val),
>
> - TP_ARGS(dev, reg, val)
> + TP_ARGS(map, reg, val)
>
> );
>
> DECLARE_EVENT_CLASS(regmap_block,
>
> - TP_PROTO(struct device *dev, unsigned int reg, int count),
> + TP_PROTO(struct regmap *map, unsigned int reg, int count),
>
> - TP_ARGS(dev, reg, count),
> + TP_ARGS(map, reg, count),
>
> TP_STRUCT__entry(
> - __string( name, dev_name(dev) )
> - __field( unsigned int, reg )
> - __field( int, count )
> + __string( name, regmap_name(map) )
> + __field( unsigned int, reg )
> + __field( int, count )
> ),
>
> TP_fast_assign(
> - __assign_str(name, dev_name(dev));
> + __assign_str(name, regmap_name(map));
> __entry->reg = reg;
> __entry->count = count;
> ),
> @@ -89,48 +88,48 @@ DECLARE_EVENT_CLASS(regmap_block,
>
> DEFINE_EVENT(regmap_block, regmap_hw_read_start,
>
> - TP_PROTO(struct device *dev, unsigned int reg, int count),
> + TP_PROTO(struct regmap *map, unsigned int reg, int count),
>
> - TP_ARGS(dev, reg, count)
> + TP_ARGS(map, reg, count)
> );
>
> DEFINE_EVENT(regmap_block, regmap_hw_read_done,
>
> - TP_PROTO(struct device *dev, unsigned int reg, int count),
> + TP_PROTO(struct regmap *map, unsigned int reg, int count),
>
> - TP_ARGS(dev, reg, count)
> + TP_ARGS(map, reg, count)
> );
>
> DEFINE_EVENT(regmap_block, regmap_hw_write_start,
>
> - TP_PROTO(struct device *dev, unsigned int reg, int count),
> + TP_PROTO(struct regmap *map, unsigned int reg, int count),
>
> - TP_ARGS(dev, reg, count)
> + TP_ARGS(map, reg, count)
> );
>
> DEFINE_EVENT(regmap_block, regmap_hw_write_done,
>
> - TP_PROTO(struct device *dev, unsigned int reg, int count),
> + TP_PROTO(struct regmap *map, unsigned int reg, int count),
>
> - TP_ARGS(dev, reg, count)
> + TP_ARGS(map, reg, count)
> );
>
> TRACE_EVENT(regcache_sync,
>
> - TP_PROTO(struct device *dev, const char *type,
> + TP_PROTO(struct regmap *map, const char *type,
> const char *status),
>
> - TP_ARGS(dev, type, status),
> + TP_ARGS(map, type, status),
>
> TP_STRUCT__entry(
> - __string( name, dev_name(dev) )
> - __string( status, status )
> - __string( type, type )
> - __field( int, type )
> + __string( name, regmap_name(map) )
> + __string( status, status )
> + __string( type, type )
> + __field( int, type )
> ),
>
> TP_fast_assign(
> - __assign_str(name, dev_name(dev));
> + __assign_str(name, regmap_name(map));
> __assign_str(status, status);
> __assign_str(type, type);
> ),
> @@ -141,17 +140,17 @@ TRACE_EVENT(regcache_sync,
>
> DECLARE_EVENT_CLASS(regmap_bool,
>
> - TP_PROTO(struct device *dev, bool flag),
> + TP_PROTO(struct regmap *map, bool flag),
>
> - TP_ARGS(dev, flag),
> + TP_ARGS(map, flag),
>
> TP_STRUCT__entry(
> - __string( name, dev_name(dev) )
> - __field( int, flag )
> + __string( name, regmap_name(map) )
> + __field( int, flag )
> ),
>
> TP_fast_assign(
> - __assign_str(name, dev_name(dev));
> + __assign_str(name, regmap_name(map));
> __entry->flag = flag;
> ),
>
> @@ -161,32 +160,32 @@ DECLARE_EVENT_CLASS(regmap_bool,
>
> DEFINE_EVENT(regmap_bool, regmap_cache_only,
>
> - TP_PROTO(struct device *dev, bool flag),
> + TP_PROTO(struct regmap *map, bool flag),
>
> - TP_ARGS(dev, flag)
> + TP_ARGS(map, flag)
>
> );
>
> DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
>
> - TP_PROTO(struct device *dev, bool flag),
> + TP_PROTO(struct regmap *map, bool flag),
>
> - TP_ARGS(dev, flag)
> + TP_ARGS(map, flag)
>
> );
>
> DECLARE_EVENT_CLASS(regmap_async,
>
> - TP_PROTO(struct device *dev),
> + TP_PROTO(struct regmap *map),
>
> - TP_ARGS(dev),
> + TP_ARGS(map),
>
> TP_STRUCT__entry(
> - __string( name, dev_name(dev) )
> + __string( name, regmap_name(map) )
> ),
>
> TP_fast_assign(
> - __assign_str(name, dev_name(dev));
> + __assign_str(name, regmap_name(map));
> ),
>
> TP_printk("%s", __get_str(name))
> @@ -194,50 +193,50 @@ DECLARE_EVENT_CLASS(regmap_async,
>
> DEFINE_EVENT(regmap_block, regmap_async_write_start,
>
> - TP_PROTO(struct device *dev, unsigned int reg, int count),
> + TP_PROTO(struct regmap *map, unsigned int reg, int count),
>
> - TP_ARGS(dev, reg, count)
> + TP_ARGS(map, reg, count)
> );
>
> DEFINE_EVENT(regmap_async, regmap_async_io_complete,
>
> - TP_PROTO(struct device *dev),
> + TP_PROTO(struct regmap *map),
>
> - TP_ARGS(dev)
> + TP_ARGS(map)
>
> );
>
> DEFINE_EVENT(regmap_async, regmap_async_complete_start,
>
> - TP_PROTO(struct device *dev),
> + TP_PROTO(struct regmap *map),
>
> - TP_ARGS(dev)
> + TP_ARGS(map)
>
> );
>
> DEFINE_EVENT(regmap_async, regmap_async_complete_done,
>
> - TP_PROTO(struct device *dev),
> + TP_PROTO(struct regmap *map),
>
> - TP_ARGS(dev)
> + TP_ARGS(map)
>
> );
>
> TRACE_EVENT(regcache_drop_region,
>
> - TP_PROTO(struct device *dev, unsigned int from,
> + TP_PROTO(struct regmap *map, unsigned int from,
> unsigned int to),
>
> - TP_ARGS(dev, from, to),
> + TP_ARGS(map, from, to),
>
> TP_STRUCT__entry(
> - __string( name, dev_name(dev) )
> - __field( unsigned int, from )
> - __field( unsigned int, to )
> + __string( name, regmap_name(map) )
> + __field( unsigned int, from )
> + __field( unsigned int, to )
> ),
>
> TP_fast_assign(
> - __assign_str(name, dev_name(dev));
> + __assign_str(name, regmap_name(map));
> __entry->from = from;
> __entry->to = to;
> ),
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
