Fix: remove regmap instrumentation for kernels < 4.1

[lttng-modules.git] / instrumentation / events / lttng-module / regmap.h

diff --git a/instrumentation/events/lttng-module/regmap.h b/instrumentation/events/lttng-module/regmap.h
index 87df6a6dc161dd708b1028bb837f03236fafdc9a..72949878caeca4249d25a31159b794bc5ad535b1 100644 (file)
--- a/instrumentation/events/lttng-module/regmap.h
+++ b/instrumentation/events/lttng-module/regmap.h
@@ -19,19 +19,19 @@ struct regmap;
  */
 LTTNG_TRACEPOINT_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)   )
+               __string(       name,           regmap_name(map))
                __field(        unsigned int,   reg             )
                __field(        unsigned int,   val             )
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, dev_name(dev))
+               tp_strcpy(name, regmap_name(map))
                tp_assign(reg, reg)
                tp_assign(val, val)
        ),
@@ -43,47 +43,42 @@ LTTNG_TRACEPOINT_EVENT_CLASS(regmap_reg,
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(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)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(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)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
 LTTNG_TRACEPOINT_EVENT_INSTANCE(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)
 )
-#endif
 
 LTTNG_TRACEPOINT_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)   )
+               __string(       name,           regmap_name(map))
                __field(        unsigned int,   reg             )
                __field(        int,            count           )
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, dev_name(dev))
+               tp_strcpy(name, regmap_name(map))
                tp_assign(reg, reg)
                tp_assign(count, count)
        ),
@@ -95,47 +90,47 @@ LTTNG_TRACEPOINT_EVENT_CLASS(regmap_block,
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(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)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(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)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(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)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(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)
 )
 
 LTTNG_TRACEPOINT_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(       name,           regmap_name(map))
                __string(       status,         status          )
                __string(       type,           type            )
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, dev_name(dev))
+               tp_strcpy(name, regmap_name(map))
                tp_strcpy(status, status)
                tp_strcpy(type, type)
        ),
@@ -144,20 +139,19 @@ LTTNG_TRACEPOINT_EVENT(regcache_sync,
                  __get_str(type), __get_str(status))
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_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)   )
+               __string(       name,           regmap_name(map))
                __field(        int,            flag            )
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, dev_name(dev))
+               tp_strcpy(name, regmap_name(map))
                tp_assign(flag, flag)
        ),
 
@@ -167,20 +161,17 @@ LTTNG_TRACEPOINT_EVENT_CLASS(regmap_bool,
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_bool, regmap_cache_only,
 
-       TP_PROTO(struct device *dev, bool flag),
-
-       TP_ARGS(dev, flag)
+       TP_PROTO(struct regmap *map, bool flag),
 
+       TP_ARGS(map, flag)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_bool, regmap_cache_bypass,
 
-       TP_PROTO(struct device *dev, bool flag),
-
-       TP_ARGS(dev, flag)
+       TP_PROTO(struct regmap *map, bool flag),
 
+       TP_ARGS(map, flag)
 )
-#endif
 
 #endif /* LTTNG_TRACE_REGMAP_H */