diff options
author | Liam Girdwood <lrg@ti.com> | 2012-11-19 09:39:14 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-20 21:39:54 -0500 |
commit | 008d55e258d8d9a5bfe03d652779cd14c770c60a (patch) | |
tree | 0805b1bbf1b5862e6da62b68a4bfd63e707aa0b2 | |
parent | 204b62c6bc1b8d3ce405c59281585af523b14172 (diff) |
ASoC: Jack: Standardise ASoC Jack messages
Currently ASoC has a mixture of message prefixes e.g. "ASoC", "asoc"
or none and message types e.g. pr_debug or dev_dbg.
Make sure all ASoC core messages use the same "ASoC" prefix and
convert any component device specific messages to use dev_dbg
instead of pr_debug.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/soc-jack.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 1ab5fe04bfcc..8da7d8a8ee70 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c | |||
@@ -172,12 +172,13 @@ int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count, | |||
172 | 172 | ||
173 | for (i = 0; i < count; i++) { | 173 | for (i = 0; i < count; i++) { |
174 | if (!pins[i].pin) { | 174 | if (!pins[i].pin) { |
175 | printk(KERN_ERR "No name for pin %d\n", i); | 175 | dev_err(jack->codec->dev, "ASoC: No name for pin %d\n", |
176 | i); | ||
176 | return -EINVAL; | 177 | return -EINVAL; |
177 | } | 178 | } |
178 | if (!pins[i].mask) { | 179 | if (!pins[i].mask) { |
179 | printk(KERN_ERR "No mask for pin %d (%s)\n", i, | 180 | dev_err(jack->codec->dev, "ASoC: No mask for pin %d" |
180 | pins[i].pin); | 181 | " (%s)\n", i, pins[i].pin); |
181 | return -EINVAL; | 182 | return -EINVAL; |
182 | } | 183 | } |
183 | 184 | ||
@@ -297,13 +298,13 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, | |||
297 | 298 | ||
298 | for (i = 0; i < count; i++) { | 299 | for (i = 0; i < count; i++) { |
299 | if (!gpio_is_valid(gpios[i].gpio)) { | 300 | if (!gpio_is_valid(gpios[i].gpio)) { |
300 | printk(KERN_ERR "Invalid gpio %d\n", | 301 | dev_err(jack->codec->dev, "ASoC: Invalid gpio %d\n", |
301 | gpios[i].gpio); | 302 | gpios[i].gpio); |
302 | ret = -EINVAL; | 303 | ret = -EINVAL; |
303 | goto undo; | 304 | goto undo; |
304 | } | 305 | } |
305 | if (!gpios[i].name) { | 306 | if (!gpios[i].name) { |
306 | printk(KERN_ERR "No name for gpio %d\n", | 307 | dev_err(jack->codec->dev, "ASoC: No name for gpio %d\n", |
307 | gpios[i].gpio); | 308 | gpios[i].gpio); |
308 | ret = -EINVAL; | 309 | ret = -EINVAL; |
309 | goto undo; | 310 | goto undo; |
@@ -332,7 +333,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, | |||
332 | if (gpios[i].wake) { | 333 | if (gpios[i].wake) { |
333 | ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1); | 334 | ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1); |
334 | if (ret != 0) | 335 | if (ret != 0) |
335 | printk(KERN_ERR | 336 | dev_err(jack->codec->dev, "ASoC: " |
336 | "Failed to mark GPIO %d as wake source: %d\n", | 337 | "Failed to mark GPIO %d as wake source: %d\n", |
337 | gpios[i].gpio, ret); | 338 | gpios[i].gpio, ret); |
338 | } | 339 | } |