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>
This commit is contained in:
parent
204b62c6bc
commit
008d55e258
1 changed files with 7 additions and 6 deletions
|
@ -172,12 +172,13 @@ int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
|
||||||
|
|
||||||
for (i = 0; i < count; i++) {
|
for (i = 0; i < count; i++) {
|
||||||
if (!pins[i].pin) {
|
if (!pins[i].pin) {
|
||||||
printk(KERN_ERR "No name for pin %d\n", i);
|
dev_err(jack->codec->dev, "ASoC: No name for pin %d\n",
|
||||||
|
i);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
if (!pins[i].mask) {
|
if (!pins[i].mask) {
|
||||||
printk(KERN_ERR "No mask for pin %d (%s)\n", i,
|
dev_err(jack->codec->dev, "ASoC: No mask for pin %d"
|
||||||
pins[i].pin);
|
" (%s)\n", i, pins[i].pin);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -297,13 +298,13 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
|
||||||
|
|
||||||
for (i = 0; i < count; i++) {
|
for (i = 0; i < count; i++) {
|
||||||
if (!gpio_is_valid(gpios[i].gpio)) {
|
if (!gpio_is_valid(gpios[i].gpio)) {
|
||||||
printk(KERN_ERR "Invalid gpio %d\n",
|
dev_err(jack->codec->dev, "ASoC: Invalid gpio %d\n",
|
||||||
gpios[i].gpio);
|
gpios[i].gpio);
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto undo;
|
goto undo;
|
||||||
}
|
}
|
||||||
if (!gpios[i].name) {
|
if (!gpios[i].name) {
|
||||||
printk(KERN_ERR "No name for gpio %d\n",
|
dev_err(jack->codec->dev, "ASoC: No name for gpio %d\n",
|
||||||
gpios[i].gpio);
|
gpios[i].gpio);
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto undo;
|
goto undo;
|
||||||
|
@ -332,7 +333,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
|
||||||
if (gpios[i].wake) {
|
if (gpios[i].wake) {
|
||||||
ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
|
ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
printk(KERN_ERR
|
dev_err(jack->codec->dev, "ASoC: "
|
||||||
"Failed to mark GPIO %d as wake source: %d\n",
|
"Failed to mark GPIO %d as wake source: %d\n",
|
||||||
gpios[i].gpio, ret);
|
gpios[i].gpio, ret);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue