Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 111c0cf566777ebbe026228b72df95788e771831

Authored by Lars-Peter Clausen
Committed by Mark Brown
1 parent 23d5442be9
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

ASoC: Remove ASoC level IO tracing 

The ASoC framework is in the process of migrating all IO operations to regmap.
regmap has its own more sophisticated tracing infrastructure for IO operations,
which means that the ASoC level IO tracing becomes redundant, hence this patch
removes them. There are still a handful of ASoC drivers left that do not use
regmap yet, but hopefully the removal of the ASoC IO tracing will be an
additional incentive to switch to regmap.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

Showing 2 changed files with 0 additions and 103 deletions Side-by-side Diff

include/trace/events/asoc.h
Diff comments   View file @ 111c0cf
... ... @@ -11,101 +11,9 @@
11 11  
12 12 struct snd_soc_jack;
13 13 struct snd_soc_codec;
14   -struct snd_soc_platform;
15 14 struct snd_soc_card;
16 15 struct snd_soc_dapm_widget;
17 16 struct snd_soc_dapm_path;
18   -
19   -/*
20   - * Log register events
21   - */
22   -DECLARE_EVENT_CLASS(snd_soc_reg,
23   -
24   - TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
25   - unsigned int val),
26   -
27   - TP_ARGS(codec, reg, val),
28   -
29   - TP_STRUCT__entry(
30   - __string( name, codec->name )
31   - __field( int, id )
32   - __field( unsigned int, reg )
33   - __field( unsigned int, val )
34   - ),
35   -
36   - TP_fast_assign(
37   - __assign_str(name, codec->name);
38   - __entry->id = codec->id;
39   - __entry->reg = reg;
40   - __entry->val = val;
41   - ),
42   -
43   - TP_printk("codec=%s.%d reg=%x val=%x", __get_str(name),
44   - (int)__entry->id, (unsigned int)__entry->reg,
45   - (unsigned int)__entry->val)
46   -);
47   -
48   -DEFINE_EVENT(snd_soc_reg, snd_soc_reg_write,
49   -
50   - TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
51   - unsigned int val),
52   -
53   - TP_ARGS(codec, reg, val)
54   -
55   -);
56   -
57   -DEFINE_EVENT(snd_soc_reg, snd_soc_reg_read,
58   -
59   - TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
60   - unsigned int val),
61   -
62   - TP_ARGS(codec, reg, val)
63   -
64   -);
65   -
66   -DECLARE_EVENT_CLASS(snd_soc_preg,
67   -
68   - TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
69   - unsigned int val),
70   -
71   - TP_ARGS(platform, reg, val),
72   -
73   - TP_STRUCT__entry(
74   - __string( name, platform->name )
75   - __field( int, id )
76   - __field( unsigned int, reg )
77   - __field( unsigned int, val )
78   - ),
79   -
80   - TP_fast_assign(
81   - __assign_str(name, platform->name);
82   - __entry->id = platform->id;
83   - __entry->reg = reg;
84   - __entry->val = val;
85   - ),
86   -
87   - TP_printk("platform=%s.%d reg=%x val=%x", __get_str(name),
88   - (int)__entry->id, (unsigned int)__entry->reg,
89   - (unsigned int)__entry->val)
90   -);
91   -
92   -DEFINE_EVENT(snd_soc_preg, snd_soc_preg_write,
93   -
94   - TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
95   - unsigned int val),
96   -
97   - TP_ARGS(platform, reg, val)
98   -
99   -);
100   -
101   -DEFINE_EVENT(snd_soc_preg, snd_soc_preg_read,
102   -
103   - TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
104   - unsigned int val),
105   -
106   - TP_ARGS(platform, reg, val)
107   -
108   -);
109 17  
110 18 DECLARE_EVENT_CLASS(snd_soc_card,
111 19  
... ... @@ -17,8 +17,6 @@
17 17 #include <linux/export.h>
18 18 #include <sound/soc.h>
19 19  
20   -#include <trace/events/asoc.h>
21   -
22 20 /**
23 21 * snd_soc_component_read() - Read register value
24 22 * @component: Component to read from
... ... @@ -39,8 +37,6 @@
39 37 else
40 38 ret = -EIO;
41 39  
42   - dev_dbg(component->dev, "read %x => %x\n", reg, *val);
43   -
44 40 return ret;
45 41 }
46 42 EXPORT_SYMBOL_GPL(snd_soc_component_read);
... ... @@ -56,8 +52,6 @@
56 52 int snd_soc_component_write(struct snd_soc_component *component,
57 53 unsigned int reg, unsigned int val)
58 54 {
59   - dev_dbg(component->dev, "write %x = %x\n", reg, val);
60   -
61 55 if (component->regmap)
62 56 return regmap_write(component->regmap, reg, val);
63 57 else if (component->write)
... ... @@ -207,7 +201,6 @@
207 201 ret = snd_soc_component_read(&codec->component, reg, &val);
208 202 if (ret < 0)
209 203 return -1;
210   - trace_snd_soc_reg_read(codec, reg, val);
211 204  
212 205 return val;
213 206 }
... ... @@ -216,7 +209,6 @@
216 209 int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
217 210 unsigned int val)
218 211 {
219   - trace_snd_soc_reg_write(codec, reg, val);
220 212 return snd_soc_component_write(&codec->component, reg, val);
221 213 }
222 214 EXPORT_SYMBOL_GPL(snd_soc_write);
... ... @@ -269,8 +261,6 @@
269 261 if (ret < 0)
270 262 return -1;
271 263  
272   - trace_snd_soc_preg_read(platform, reg, val);
273   -
274 264 return val;
275 265 }
276 266 EXPORT_SYMBOL_GPL(snd_soc_platform_read);
... ... @@ -278,7 +268,6 @@
278 268 int snd_soc_platform_write(struct snd_soc_platform *platform,
279 269 unsigned int reg, unsigned int val)
280 270 {
281   - trace_snd_soc_preg_write(platform, reg, val);
282 271 return snd_soc_component_write(&platform->component, reg, val);
283 272 }
284 273 EXPORT_SYMBOL_GPL(snd_soc_platform_write);