regmap: introduce regmap_name to fix syscon regmap trace events

This patch fixes a NULL pointer dereference when enabling regmap event tracing in the presence of a syscon regmap, introduced by commit bdb0066df96e ("mfd: syscon: Decouple syscon interface from platform devices"). That patch introduced syscon regmaps that have their dev field set to NULL. The regmap trace events expect it to point to a valid struct device and feed it to dev_name(): $ echo 1 > /sys/kernel/debug/tracing/events/regmap/enable Unable to handle kernel NULL pointer dereference at virtual address 0000002c pgd = 80004000 [0000002c] *pgd=00000000 Internal error: Oops: 17 [#1] SMP ARM Modules linked in: coda videobuf2_vmalloc CPU: 0 PID: 304 Comm: kworker/0:2 Not tainted 4.0.0-rc2+ #9197 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) Workqueue: events_freezable thermal_zone_device_check task: 9f25a200 ti: 9f1ee000 task.ti: 9f1ee000 PC is at ftrace_raw_event_regmap_block+0x3c/0xe4 LR is at _regmap_raw_read+0x1bc/0x1cc pc : [<803636e8>] lr : [<80365f2c>] psr: 600f0093 sp : 9f1efd78 ip : 9f1efdb8 fp : 9f1efdb4 r10: 00000004 r9 : 00000001 r8 : 00000001 r7 : 00000180 r6 : 00000000 r5 : 9f00e3c0 r4 : 00000003 r3 : 00000001 r2 : 00000180 r1 : 00000000 r0 : 9f00e3c0 Flags: nZCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c5387d Table: 2d91004a DAC: 00000015 Process kworker/0:2 (pid: 304, stack limit = 0x9f1ee210) Stack: (0x9f1efd78 to 0x9f1f0000) fd60: 9f1efda4 9f1efd88 fd80: 800708c0 805f9510 80927140 800f0013 9f1fc800 9eb2f490 00000000 00000180 fda0: 808e3840 00000001 9f1efdfc 9f1efdb8 80365f2c 803636b8 805f8958 800708e0 fdc0: a00f0013 803636ac 9f16de00 00000180 80927140 9f1fc800 9f1fc800 9f1efe6c fde0: 9f1efe6c 9f732400 00000000 00000000 9f1efe1c 9f1efe00 80365f70 80365d7c fe00: 80365f3c 9f1fc800 9f1fc800 00000180 9f1efe44 9f1efe20 803656a4 80365f48 fe20: 9f1fc800 00000180 9f1efe6c 9f1efe6c 9f732400 00000000 9f1efe64 9f1efe48 fe40: 803657bc 80365634 00000001 9e95f910 9f1fc800 9f1efeb4 9f1efe8c 9f1efe68 fe60: 80452ac0 80365778 9f1efe8c 9f1efe78 9e93d400 9e93d5e8 9f1efeb4 9f72ef40 fe80: 9f1efeac 9f1efe90 8044e11c 80452998 8045298c 9e93d608 9e93d400 808e1978 fea0: 9f1efecc 9f1efeb0 8044fd14 8044e0d0 ffffffff 9f25a200 9e93d608 9e481380 fec0: 9f1efedc 9f1efed0 8044fde8 8044fcec 9f1eff1c 9f1efee0 80038d50 8044fdd8 fee0: 9f1ee020 9f72ef40 9e481398 00000000 00000008 9f72ef54 9f1ee020 9f72ef40 ff00: 9e481398 9e481380 00000008 9f72ef40 9f1eff5c 9f1eff20 80039754 80038bfc ff20: 00000000 9e481380 80894100 808e1662 00000000 9e4f2ec0 00000000 9e481380 ff40: 800396f8 00000000 00000000 00000000 9f1effac 9f1eff60 8003e020 80039704 ff60: ffffffff 00000000 ffffffff 9e481380 00000000 00000000 9f1eff78 9f1eff78 ff80: 00000000 00000000 9f1eff88 9f1eff88 9e4f2ec0 8003df30 00000000 00000000 ffa0: 00000000 9f1effb0 8000eb60 8003df3c 00000000 00000000 00000000 00000000 ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 ffffffff ffffffff Backtrace: [<803636ac>] (ftrace_raw_event_regmap_block) from [<80365f2c>] (_regmap_raw_read+0x1bc/0x1cc) r9:00000001 r8:808e3840 r7:00000180 r6:00000000 r5:9eb2f490 r4:9f1fc800 [<80365d70>] (_regmap_raw_read) from [<80365f70>] (_regmap_bus_read+0x34/0x6c) r10:00000000 r9:00000000 r8:9f732400 r7:9f1efe6c r6:9f1efe6c r5:9f1fc800 r4:9f1fc800 [<80365f3c>] (_regmap_bus_read) from [<803656a4>] (_regmap_read+0x7c/0x144) r6:00000180 r5:9f1fc800 r4:9f1fc800 r3:80365f3c [<80365628>] (_regmap_read) from [<803657bc>] (regmap_read+0x50/0x70) r9:00000000 r8:9f732400 r7:9f1efe6c r6:9f1efe6c r5:00000180 r4:9f1fc800 [<8036576c>] (regmap_read) from [<80452ac0>] (imx_get_temp+0x134/0x1a4) r6:9f1efeb4 r5:9f1fc800 r4:9e95f910 r3:00000001 [<8045298c>] (imx_get_temp) from [<8044e11c>] (thermal_zone_get_temp+0x58/0x74) r7:9f72ef40 r6:9f1efeb4 r5:9e93d5e8 r4:9e93d400 [<8044e0c4>] (thermal_zone_get_temp) from [<8044fd14>] (thermal_zone_device_update+0x34/0xec) r6:808e1978 r5:9e93d400 r4:9e93d608 r3:8045298c [<8044fce0>] (thermal_zone_device_update) from [<8044fde8>] (thermal_zone_device_check+0x1c/0x20) r5:9e481380 r4:9e93d608 [<8044fdcc>] (thermal_zone_device_check) from [<80038d50>] (process_one_work+0x160/0x3d4) [<80038bf0>] (process_one_work) from [<80039754>] (worker_thread+0x5c/0x4f4) r10:9f72ef40 r9:00000008 r8:9e481380 r7:9e481398 r6:9f72ef40 r5:9f1ee020 r4:9f72ef54 [<800396f8>] (worker_thread) from [<8003e020>] (kthread+0xf0/0x108) r10:00000000 r9:00000000 r8:00000000 r7:800396f8 r6:9e481380 r5:00000000 r4:9e4f2ec0 [<8003df30>] (kthread) from [<8000eb60>] (ret_from_fork+0x14/0x34) r7:00000000 r6:00000000 r5:8003df30 r4:9e4f2ec0 Code: e3140040 1a00001a e3140020 1a000016 (e596002c) ---[ end trace 193c15c2494ec960 ]--- Fixes: bdb0066df96e (mfd: syscon: Decouple syscon interface from platform devices) Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org
author: Philipp Zabel <p.zabel@pengutronix.de> 2015-03-09 07:20:13 -0400
committer: Mark Brown <broonie@kernel.org> 2015-03-19 16:04:55 -0400
commit: c6b570d97c0e77f570bb6b2ed30d372b2b1e9aae (patch)
tree: a32262db44662a88b2d14e4dea865f34ceabc389 /include/trace/events/regmap.h
parent: c517d838eb7d07bbe9507871fab3931deccff539 (diff)
1 files changed, 61 insertions, 62 deletions
diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
index 23d561512f64..22317d2b52ab 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;
+#include "../../../drivers/base/regmap/internal.h"
-struct regmap;
 /*
 * 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)   )
+                __string(       name,           regmap_name(map)        )
-                __field(        unsigned int,   reg             )
+                __field(        unsigned int,   reg                     )
-                __field(        unsigned int,   val             )
+                __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)   )
+                __string(       name,           regmap_name(map)        )
-                __field(        unsigned int,   reg             )
+                __field(        unsigned int,   reg                     )
-                __field(        int,            count           )
+                __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(       name,           regmap_name(map)        )
-                __string(       status,         status          )
+                __string(       status,         status                  )
-                __string(       type,           type            )
+                __string(       type,           type                    )
-                __field(        int,            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)   )
+                __string(       name,           regmap_name(map)        )
-                __field(        int,            flag            )
+                __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)   )
+                __string(       name,           regmap_name(map)        )
-                __field(        unsigned int,   from            )
+                __field(        unsigned int,   from                    )
-                __field(        unsigned int,   to              )
+                __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;
        ),
author	Philipp Zabel <p.zabel@pengutronix.de>	2015-03-09 07:20:13 -0400
committer	Mark Brown <broonie@kernel.org>	2015-03-19 16:04:55 -0400
commit	c6b570d97c0e77f570bb6b2ed30d372b2b1e9aae (patch)
tree	a32262db44662a88b2d14e4dea865f34ceabc389 /include/trace/events/regmap.h
parent	c517d838eb7d07bbe9507871fab3931deccff539 (diff)

diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h index 23d561512f64..22317d2b52ab 100644 --- a/include/trace/events/regmap.h +++ b/include/trace/events/regmap.h
@@ -7,27 +7,26 @@
7	#include <linux/ktime.h>	7	#include <linux/ktime.h>
8	#include <linux/tracepoint.h>	8	#include <linux/tracepoint.h>
9		9
10	struct device;	10	#include "../../../drivers/base/regmap/internal.h"
11	struct regmap;
12		11
13	/*	12	/*
14	* Log register events	13	* Log register events
15	*/	14	*/
16	DECLARE_EVENT_CLASS(regmap_reg,	15	DECLARE_EVENT_CLASS(regmap_reg,
17		16
18	TP_PROTO(struct device *dev, unsigned int reg,	17	TP_PROTO(struct regmap *map, unsigned int reg,
19	unsigned int val),	18	unsigned int val),
20		19
21	TP_ARGS(dev, reg, val),	20	TP_ARGS(map, reg, val),
22		21
23	TP_STRUCT__entry(	22	TP_STRUCT__entry(
24	__string( name, dev_name(dev) )	23	__string( name, regmap_name(map) )
25	__field( unsigned int, reg )	24	__field( unsigned int, reg )
26	__field( unsigned int, val )	25	__field( unsigned int, val )
27	),	26	),
28		27
29	TP_fast_assign(	28	TP_fast_assign(
30	__assign_str(name, dev_name(dev));	29	__assign_str(name, regmap_name(map));
31	__entry->reg = reg;	30	__entry->reg = reg;
32	__entry->val = val;	31	__entry->val = val;
33	),	32	),
@@ -39,45 +38,45 @@ DECLARE_EVENT_CLASS(regmap_reg,
39		38
40	DEFINE_EVENT(regmap_reg, regmap_reg_write,	39	DEFINE_EVENT(regmap_reg, regmap_reg_write,
41		40
42	TP_PROTO(struct device *dev, unsigned int reg,	41	TP_PROTO(struct regmap *map, unsigned int reg,
43	unsigned int val),	42	unsigned int val),
44		43
45	TP_ARGS(dev, reg, val)	44	TP_ARGS(map, reg, val)
46		45
47	);	46	);
48		47
49	DEFINE_EVENT(regmap_reg, regmap_reg_read,	48	DEFINE_EVENT(regmap_reg, regmap_reg_read,
50		49
51	TP_PROTO(struct device *dev, unsigned int reg,	50	TP_PROTO(struct regmap *map, unsigned int reg,
52	unsigned int val),	51	unsigned int val),
53		52
54	TP_ARGS(dev, reg, val)	53	TP_ARGS(map, reg, val)
55		54
56	);	55	);
57		56
58	DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,	57	DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,
59		58
60	TP_PROTO(struct device *dev, unsigned int reg,	59	TP_PROTO(struct regmap *map, unsigned int reg,
61	unsigned int val),	60	unsigned int val),
62		61
63	TP_ARGS(dev, reg, val)	62	TP_ARGS(map, reg, val)
64		63
65	);	64	);
66		65
67	DECLARE_EVENT_CLASS(regmap_block,	66	DECLARE_EVENT_CLASS(regmap_block,
68		67
69	TP_PROTO(struct device *dev, unsigned int reg, int count),	68	TP_PROTO(struct regmap *map, unsigned int reg, int count),
70		69
71	TP_ARGS(dev, reg, count),	70	TP_ARGS(map, reg, count),
72		71
73	TP_STRUCT__entry(	72	TP_STRUCT__entry(
74	__string( name, dev_name(dev) )	73	__string( name, regmap_name(map) )
75	__field( unsigned int, reg )	74	__field( unsigned int, reg )
76	__field( int, count )	75	__field( int, count )
77	),	76	),
78		77
79	TP_fast_assign(	78	TP_fast_assign(
80	__assign_str(name, dev_name(dev));	79	__assign_str(name, regmap_name(map));
81	__entry->reg = reg;	80	__entry->reg = reg;
82	__entry->count = count;	81	__entry->count = count;
83	),	82	),
@@ -89,48 +88,48 @@ DECLARE_EVENT_CLASS(regmap_block,
89		88
90	DEFINE_EVENT(regmap_block, regmap_hw_read_start,	89	DEFINE_EVENT(regmap_block, regmap_hw_read_start,
91		90
92	TP_PROTO(struct device *dev, unsigned int reg, int count),	91	TP_PROTO(struct regmap *map, unsigned int reg, int count),
93		92
94	TP_ARGS(dev, reg, count)	93	TP_ARGS(map, reg, count)
95	);	94	);
96		95
97	DEFINE_EVENT(regmap_block, regmap_hw_read_done,	96	DEFINE_EVENT(regmap_block, regmap_hw_read_done,
98		97
99	TP_PROTO(struct device *dev, unsigned int reg, int count),	98	TP_PROTO(struct regmap *map, unsigned int reg, int count),
100		99
101	TP_ARGS(dev, reg, count)	100	TP_ARGS(map, reg, count)
102	);	101	);
103		102
104	DEFINE_EVENT(regmap_block, regmap_hw_write_start,	103	DEFINE_EVENT(regmap_block, regmap_hw_write_start,
105		104
106	TP_PROTO(struct device *dev, unsigned int reg, int count),	105	TP_PROTO(struct regmap *map, unsigned int reg, int count),
107		106
108	TP_ARGS(dev, reg, count)	107	TP_ARGS(map, reg, count)
109	);	108	);
110		109
111	DEFINE_EVENT(regmap_block, regmap_hw_write_done,	110	DEFINE_EVENT(regmap_block, regmap_hw_write_done,
112		111
113	TP_PROTO(struct device *dev, unsigned int reg, int count),	112	TP_PROTO(struct regmap *map, unsigned int reg, int count),
114		113
115	TP_ARGS(dev, reg, count)	114	TP_ARGS(map, reg, count)
116	);	115	);
117		116
118	TRACE_EVENT(regcache_sync,	117	TRACE_EVENT(regcache_sync,
119		118
120	TP_PROTO(struct device dev, const char type,	119	TP_PROTO(struct regmap map, const char type,
121	const char *status),	120	const char *status),
122		121
123	TP_ARGS(dev, type, status),	122	TP_ARGS(map, type, status),
124		123
125	TP_STRUCT__entry(	124	TP_STRUCT__entry(
126	__string( name, dev_name(dev) )	125	__string( name, regmap_name(map) )
127	__string( status, status )	126	__string( status, status )
128	__string( type, type )	127	__string( type, type )
129	__field( int, type )	128	__field( int, type )
130	),	129	),
131		130
132	TP_fast_assign(	131	TP_fast_assign(
133	__assign_str(name, dev_name(dev));	132	__assign_str(name, regmap_name(map));
134	__assign_str(status, status);	133	__assign_str(status, status);
135	__assign_str(type, type);	134	__assign_str(type, type);
136	),	135	),
@@ -141,17 +140,17 @@ TRACE_EVENT(regcache_sync,
141		140
142	DECLARE_EVENT_CLASS(regmap_bool,	141	DECLARE_EVENT_CLASS(regmap_bool,
143		142
144	TP_PROTO(struct device *dev, bool flag),	143	TP_PROTO(struct regmap *map, bool flag),
145		144
146	TP_ARGS(dev, flag),	145	TP_ARGS(map, flag),
147		146
148	TP_STRUCT__entry(	147	TP_STRUCT__entry(
149	__string( name, dev_name(dev) )	148	__string( name, regmap_name(map) )
150	__field( int, flag )	149	__field( int, flag )
151	),	150	),
152		151
153	TP_fast_assign(	152	TP_fast_assign(
154	__assign_str(name, dev_name(dev));	153	__assign_str(name, regmap_name(map));
155	__entry->flag = flag;	154	__entry->flag = flag;
156	),	155	),
157		156
@@ -161,32 +160,32 @@ DECLARE_EVENT_CLASS(regmap_bool,
161		160
162	DEFINE_EVENT(regmap_bool, regmap_cache_only,	161	DEFINE_EVENT(regmap_bool, regmap_cache_only,
163		162
164	TP_PROTO(struct device *dev, bool flag),	163	TP_PROTO(struct regmap *map, bool flag),
165		164
166	TP_ARGS(dev, flag)	165	TP_ARGS(map, flag)
167		166
168	);	167	);
169		168
170	DEFINE_EVENT(regmap_bool, regmap_cache_bypass,	169	DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
171		170
172	TP_PROTO(struct device *dev, bool flag),	171	TP_PROTO(struct regmap *map, bool flag),
173		172
174	TP_ARGS(dev, flag)	173	TP_ARGS(map, flag)
175		174
176	);	175	);
177		176
178	DECLARE_EVENT_CLASS(regmap_async,	177	DECLARE_EVENT_CLASS(regmap_async,
179		178
180	TP_PROTO(struct device *dev),	179	TP_PROTO(struct regmap *map),
181		180
182	TP_ARGS(dev),	181	TP_ARGS(map),
183		182
184	TP_STRUCT__entry(	183	TP_STRUCT__entry(
185	__string( name, dev_name(dev) )	184	__string( name, regmap_name(map) )
186	),	185	),
187		186
188	TP_fast_assign(	187	TP_fast_assign(
189	__assign_str(name, dev_name(dev));	188	__assign_str(name, regmap_name(map));
190	),	189	),
191		190
192	TP_printk("%s", __get_str(name))	191	TP_printk("%s", __get_str(name))
@@ -194,50 +193,50 @@ DECLARE_EVENT_CLASS(regmap_async,
194		193
195	DEFINE_EVENT(regmap_block, regmap_async_write_start,	194	DEFINE_EVENT(regmap_block, regmap_async_write_start,
196		195
197	TP_PROTO(struct device *dev, unsigned int reg, int count),	196	TP_PROTO(struct regmap *map, unsigned int reg, int count),
198		197
199	TP_ARGS(dev, reg, count)	198	TP_ARGS(map, reg, count)
200	);	199	);
201		200
202	DEFINE_EVENT(regmap_async, regmap_async_io_complete,	201	DEFINE_EVENT(regmap_async, regmap_async_io_complete,
203		202
204	TP_PROTO(struct device *dev),	203	TP_PROTO(struct regmap *map),
205		204
206	TP_ARGS(dev)	205	TP_ARGS(map)
207		206
208	);	207	);
209		208
210	DEFINE_EVENT(regmap_async, regmap_async_complete_start,	209	DEFINE_EVENT(regmap_async, regmap_async_complete_start,
211		210
212	TP_PROTO(struct device *dev),	211	TP_PROTO(struct regmap *map),
213		212
214	TP_ARGS(dev)	213	TP_ARGS(map)
215		214
216	);	215	);
217		216
218	DEFINE_EVENT(regmap_async, regmap_async_complete_done,	217	DEFINE_EVENT(regmap_async, regmap_async_complete_done,
219		218
220	TP_PROTO(struct device *dev),	219	TP_PROTO(struct regmap *map),
221		220
222	TP_ARGS(dev)	221	TP_ARGS(map)
223		222
224	);	223	);
225		224
226	TRACE_EVENT(regcache_drop_region,	225	TRACE_EVENT(regcache_drop_region,
227		226
228	TP_PROTO(struct device *dev, unsigned int from,	227	TP_PROTO(struct regmap *map, unsigned int from,
229	unsigned int to),	228	unsigned int to),
230		229
231	TP_ARGS(dev, from, to),	230	TP_ARGS(map, from, to),
232		231
233	TP_STRUCT__entry(	232	TP_STRUCT__entry(
234	__string( name, dev_name(dev) )	233	__string( name, regmap_name(map) )
235	__field( unsigned int, from )	234	__field( unsigned int, from )
236	__field( unsigned int, to )	235	__field( unsigned int, to )
237	),	236	),
238		237
239	TP_fast_assign(	238	TP_fast_assign(
240	__assign_str(name, dev_name(dev));	239	__assign_str(name, regmap_name(map));
241	__entry->from = from;	240	__entry->from = from;
242	__entry->to = to;	241	__entry->to = to;
243	),	242	),