ASoC: fix kernel message grepability
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Michał Mirosław
Mark Brown
parent
f722406faa
commit
10e8aa9af1
1 changed files with 43 additions and 34 deletions
|
|
@ -272,8 +272,8 @@ static void soc_init_codec_debugfs(struct snd_soc_codec *codec)
|
||||||
codec->debugfs_codec_root = debugfs_create_dir(codec->name,
|
codec->debugfs_codec_root = debugfs_create_dir(codec->name,
|
||||||
debugfs_card_root);
|
debugfs_card_root);
|
||||||
if (!codec->debugfs_codec_root) {
|
if (!codec->debugfs_codec_root) {
|
||||||
dev_warn(codec->dev, "ASoC: Failed to create codec debugfs"
|
dev_warn(codec->dev,
|
||||||
" directory\n");
|
"ASoC: Failed to create codec debugfs directory\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -286,8 +286,8 @@ static void soc_init_codec_debugfs(struct snd_soc_codec *codec)
|
||||||
codec->debugfs_codec_root,
|
codec->debugfs_codec_root,
|
||||||
codec, &codec_reg_fops);
|
codec, &codec_reg_fops);
|
||||||
if (!codec->debugfs_reg)
|
if (!codec->debugfs_reg)
|
||||||
dev_warn(codec->dev, "ASoC: Failed to create codec register"
|
dev_warn(codec->dev,
|
||||||
" debugfs file\n");
|
"ASoC: Failed to create codec register debugfs file\n");
|
||||||
|
|
||||||
snd_soc_dapm_debugfs_init(&codec->dapm, codec->debugfs_codec_root);
|
snd_soc_dapm_debugfs_init(&codec->dapm, codec->debugfs_codec_root);
|
||||||
}
|
}
|
||||||
|
|
@ -631,8 +631,7 @@ int snd_soc_suspend(struct device *dev)
|
||||||
*/
|
*/
|
||||||
if (codec->dapm.idle_bias_off) {
|
if (codec->dapm.idle_bias_off) {
|
||||||
dev_dbg(codec->dev,
|
dev_dbg(codec->dev,
|
||||||
"ASoC: idle_bias_off CODEC on"
|
"ASoC: idle_bias_off CODEC on over suspend\n");
|
||||||
" over suspend\n");
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SND_SOC_BIAS_OFF:
|
case SND_SOC_BIAS_OFF:
|
||||||
|
|
@ -643,8 +642,8 @@ int snd_soc_suspend(struct device *dev)
|
||||||
regcache_mark_dirty(codec->control_data);
|
regcache_mark_dirty(codec->control_data);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_dbg(codec->dev, "ASoC: CODEC is on"
|
dev_dbg(codec->dev,
|
||||||
" over suspend\n");
|
"ASoC: CODEC is on over suspend\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -713,8 +712,8 @@ static void soc_resume_deferred(struct work_struct *work)
|
||||||
codec->suspended = 0;
|
codec->suspended = 0;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_dbg(codec->dev, "ASoC: CODEC was on over"
|
dev_dbg(codec->dev,
|
||||||
" suspend\n");
|
"ASoC: CODEC was on over suspend\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1110,8 +1109,8 @@ static int soc_probe_codec(struct snd_soc_card *card,
|
||||||
}
|
}
|
||||||
WARN(codec->dapm.idle_bias_off &&
|
WARN(codec->dapm.idle_bias_off &&
|
||||||
codec->dapm.bias_level != SND_SOC_BIAS_OFF,
|
codec->dapm.bias_level != SND_SOC_BIAS_OFF,
|
||||||
"codec %s can not start from non-off bias"
|
"codec %s can not start from non-off bias with idle_bias_off==1\n",
|
||||||
" with idle_bias_off==1\n", codec->name);
|
codec->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If the driver didn't set I/O up try regmap */
|
/* If the driver didn't set I/O up try regmap */
|
||||||
|
|
@ -1582,8 +1581,9 @@ static int snd_soc_init_codec_cache(struct snd_soc_codec *codec,
|
||||||
codec->compress_type = compress_type;
|
codec->compress_type = compress_type;
|
||||||
ret = snd_soc_cache_init(codec);
|
ret = snd_soc_cache_init(codec);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(codec->dev, "ASoC: Failed to set cache compression"
|
dev_err(codec->dev,
|
||||||
" type: %d\n", ret);
|
"ASoC: Failed to set cache compression type: %d\n",
|
||||||
|
ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
codec->cache_init = 1;
|
codec->cache_init = 1;
|
||||||
|
|
@ -1639,8 +1639,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
|
||||||
ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
|
ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
|
||||||
card->owner, 0, &card->snd_card);
|
card->owner, 0, &card->snd_card);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(card->dev, "ASoC: can't create sound card for"
|
dev_err(card->dev,
|
||||||
" card %s: %d\n", card->name, ret);
|
"ASoC: can't create sound card for card %s: %d\n",
|
||||||
|
card->name, ret);
|
||||||
goto base_error;
|
goto base_error;
|
||||||
}
|
}
|
||||||
card->snd_card->dev = card->dev;
|
card->snd_card->dev = card->dev;
|
||||||
|
|
@ -1815,8 +1816,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
|
||||||
for (i = 0; i < card->num_rtd; i++) {
|
for (i = 0; i < card->num_rtd; i++) {
|
||||||
ret = soc_register_ac97_dai_link(&card->rtd[i]);
|
ret = soc_register_ac97_dai_link(&card->rtd[i]);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(card->dev, "ASoC: failed to register AC97:"
|
dev_err(card->dev,
|
||||||
" %d\n", ret);
|
"ASoC: failed to register AC97: %d\n", ret);
|
||||||
while (--i >= 0)
|
while (--i >= 0)
|
||||||
soc_unregister_ac97_dai_link(card->rtd[i].codec);
|
soc_unregister_ac97_dai_link(card->rtd[i].codec);
|
||||||
goto probe_aux_dev_err;
|
goto probe_aux_dev_err;
|
||||||
|
|
@ -3586,14 +3587,16 @@ int snd_soc_register_card(struct snd_soc_card *card)
|
||||||
* not both or neither.
|
* not both or neither.
|
||||||
*/
|
*/
|
||||||
if (!!link->codec_name == !!link->codec_of_node) {
|
if (!!link->codec_name == !!link->codec_of_node) {
|
||||||
dev_err(card->dev, "ASoC: Neither/both codec"
|
dev_err(card->dev,
|
||||||
" name/of_node are set for %s\n", link->name);
|
"ASoC: Neither/both codec name/of_node are set for %s\n",
|
||||||
|
link->name);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
/* Codec DAI name must be specified */
|
/* Codec DAI name must be specified */
|
||||||
if (!link->codec_dai_name) {
|
if (!link->codec_dai_name) {
|
||||||
dev_err(card->dev, "ASoC: codec_dai_name not"
|
dev_err(card->dev,
|
||||||
" set for %s\n", link->name);
|
"ASoC: codec_dai_name not set for %s\n",
|
||||||
|
link->name);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3602,8 +3605,9 @@ int snd_soc_register_card(struct snd_soc_card *card)
|
||||||
* can be left unspecified, and a dummy platform will be used.
|
* can be left unspecified, and a dummy platform will be used.
|
||||||
*/
|
*/
|
||||||
if (link->platform_name && link->platform_of_node) {
|
if (link->platform_name && link->platform_of_node) {
|
||||||
dev_err(card->dev, "ASoC: Both platform name/of_node"
|
dev_err(card->dev,
|
||||||
" are set for %s\n", link->name);
|
"ASoC: Both platform name/of_node are set for %s\n",
|
||||||
|
link->name);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3613,8 +3617,9 @@ int snd_soc_register_card(struct snd_soc_card *card)
|
||||||
* name alone..
|
* name alone..
|
||||||
*/
|
*/
|
||||||
if (link->cpu_name && link->cpu_of_node) {
|
if (link->cpu_name && link->cpu_of_node) {
|
||||||
dev_err(card->dev, "ASoC: Neither/both "
|
dev_err(card->dev,
|
||||||
"cpu name/of_node are set for %s\n",link->name);
|
"ASoC: Neither/both cpu name/of_node are set for %s\n",
|
||||||
|
link->name);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
|
@ -3623,8 +3628,9 @@ int snd_soc_register_card(struct snd_soc_card *card)
|
||||||
*/
|
*/
|
||||||
if (!link->cpu_dai_name &&
|
if (!link->cpu_dai_name &&
|
||||||
!(link->cpu_name || link->cpu_of_node)) {
|
!(link->cpu_name || link->cpu_of_node)) {
|
||||||
dev_err(card->dev, "ASoC: Neither cpu_dai_name nor "
|
dev_err(card->dev,
|
||||||
"cpu_name/of_node are set for %s\n", link->name);
|
"ASoC: Neither cpu_dai_name nor cpu_name/of_node are set for %s\n",
|
||||||
|
link->name);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -3728,8 +3734,9 @@ static inline char *fmt_multiple_name(struct device *dev,
|
||||||
struct snd_soc_dai_driver *dai_drv)
|
struct snd_soc_dai_driver *dai_drv)
|
||||||
{
|
{
|
||||||
if (dai_drv->name == NULL) {
|
if (dai_drv->name == NULL) {
|
||||||
dev_err(dev, "ASoC: error - multiple DAI %s registered with"
|
dev_err(dev,
|
||||||
" no name\n", dev_name(dev));
|
"ASoC: error - multiple DAI %s registered with no name\n",
|
||||||
|
dev_name(dev));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3859,8 +3866,9 @@ static int snd_soc_register_dais(struct device *dev,
|
||||||
|
|
||||||
list_for_each_entry(codec, &codec_list, list) {
|
list_for_each_entry(codec, &codec_list, list) {
|
||||||
if (codec->dev == dev) {
|
if (codec->dev == dev) {
|
||||||
dev_dbg(dev, "ASoC: Mapped DAI %s to "
|
dev_dbg(dev,
|
||||||
"CODEC %s\n", dai->name, codec->name);
|
"ASoC: Mapped DAI %s to CODEC %s\n",
|
||||||
|
dai->name, codec->name);
|
||||||
dai->codec = codec;
|
dai->codec = codec;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -4296,8 +4304,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
|
||||||
|
|
||||||
num_routes = of_property_count_strings(np, propname);
|
num_routes = of_property_count_strings(np, propname);
|
||||||
if (num_routes < 0 || num_routes & 1) {
|
if (num_routes < 0 || num_routes & 1) {
|
||||||
dev_err(card->dev, "ASoC: Property '%s' does not exist or its"
|
dev_err(card->dev,
|
||||||
" length is not even\n", propname);
|
"ASoC: Property '%s' does not exist or its length is not even\n",
|
||||||
|
propname);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
num_routes /= 2;
|
num_routes /= 2;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue