diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-04-22 07:23:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-22 08:24:24 -0400 |
commit | 111c0cf566777ebbe026228b72df95788e771831 (patch) | |
tree | f8373e8018b2aae6ca710aaf568942a7acd2a139 /sound/soc/soc-io.c | |
parent | 23d5442be9066107b9909ee0e64913aebad434f3 (diff) |
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>
Diffstat (limited to 'sound/soc/soc-io.c')
-rw-r--r-- | sound/soc/soc-io.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index 2ead9edd0d63..7767fbd73eb7 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c | |||
@@ -17,8 +17,6 @@ | |||
17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
18 | #include <sound/soc.h> | 18 | #include <sound/soc.h> |
19 | 19 | ||
20 | #include <trace/events/asoc.h> | ||
21 | |||
22 | /** | 20 | /** |
23 | * snd_soc_component_read() - Read register value | 21 | * snd_soc_component_read() - Read register value |
24 | * @component: Component to read from | 22 | * @component: Component to read from |
@@ -39,8 +37,6 @@ int snd_soc_component_read(struct snd_soc_component *component, | |||
39 | else | 37 | else |
40 | ret = -EIO; | 38 | ret = -EIO; |
41 | 39 | ||
42 | dev_dbg(component->dev, "read %x => %x\n", reg, *val); | ||
43 | |||
44 | return ret; | 40 | return ret; |
45 | } | 41 | } |
46 | EXPORT_SYMBOL_GPL(snd_soc_component_read); | 42 | EXPORT_SYMBOL_GPL(snd_soc_component_read); |
@@ -56,8 +52,6 @@ EXPORT_SYMBOL_GPL(snd_soc_component_read); | |||
56 | int snd_soc_component_write(struct snd_soc_component *component, | 52 | int snd_soc_component_write(struct snd_soc_component *component, |
57 | unsigned int reg, unsigned int val) | 53 | unsigned int reg, unsigned int val) |
58 | { | 54 | { |
59 | dev_dbg(component->dev, "write %x = %x\n", reg, val); | ||
60 | |||
61 | if (component->regmap) | 55 | if (component->regmap) |
62 | return regmap_write(component->regmap, reg, val); | 56 | return regmap_write(component->regmap, reg, val); |
63 | else if (component->write) | 57 | else if (component->write) |
@@ -207,7 +201,6 @@ unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg) | |||
207 | ret = snd_soc_component_read(&codec->component, reg, &val); | 201 | ret = snd_soc_component_read(&codec->component, reg, &val); |
208 | if (ret < 0) | 202 | if (ret < 0) |
209 | return -1; | 203 | return -1; |
210 | trace_snd_soc_reg_read(codec, reg, val); | ||
211 | 204 | ||
212 | return val; | 205 | return val; |
213 | } | 206 | } |
@@ -216,7 +209,6 @@ EXPORT_SYMBOL_GPL(snd_soc_read); | |||
216 | int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg, | 209 | int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg, |
217 | unsigned int val) | 210 | unsigned int val) |
218 | { | 211 | { |
219 | trace_snd_soc_reg_write(codec, reg, val); | ||
220 | return snd_soc_component_write(&codec->component, reg, val); | 212 | return snd_soc_component_write(&codec->component, reg, val); |
221 | } | 213 | } |
222 | EXPORT_SYMBOL_GPL(snd_soc_write); | 214 | EXPORT_SYMBOL_GPL(snd_soc_write); |
@@ -269,8 +261,6 @@ int snd_soc_platform_read(struct snd_soc_platform *platform, | |||
269 | if (ret < 0) | 261 | if (ret < 0) |
270 | return -1; | 262 | return -1; |
271 | 263 | ||
272 | trace_snd_soc_preg_read(platform, reg, val); | ||
273 | |||
274 | return val; | 264 | return val; |
275 | } | 265 | } |
276 | EXPORT_SYMBOL_GPL(snd_soc_platform_read); | 266 | EXPORT_SYMBOL_GPL(snd_soc_platform_read); |
@@ -278,7 +268,6 @@ EXPORT_SYMBOL_GPL(snd_soc_platform_read); | |||
278 | int snd_soc_platform_write(struct snd_soc_platform *platform, | 268 | int snd_soc_platform_write(struct snd_soc_platform *platform, |
279 | unsigned int reg, unsigned int val) | 269 | unsigned int reg, unsigned int val) |
280 | { | 270 | { |
281 | trace_snd_soc_preg_write(platform, reg, val); | ||
282 | return snd_soc_component_write(&platform->component, reg, val); | 271 | return snd_soc_component_write(&platform->component, reg, val); |
283 | } | 272 | } |
284 | EXPORT_SYMBOL_GPL(snd_soc_platform_write); | 273 | EXPORT_SYMBOL_GPL(snd_soc_platform_write); |