Commit 2e55b90a authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: Make soc_dpcm_debugfs_add() non-fatal

Failing to register the debugfs entries is not fatal and will not affect
normal operation of the sound card. Don't abort the card registration if
soc_dpcm_debugfs_add() fails.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0757d834
...@@ -135,7 +135,7 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream, ...@@ -135,7 +135,7 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream,
/* internal use only */ /* internal use only */
int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute); int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute);
int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
int soc_dpcm_runtime_update(struct snd_soc_card *); int soc_dpcm_runtime_update(struct snd_soc_card *);
int dpcm_path_get(struct snd_soc_pcm_runtime *fe, int dpcm_path_get(struct snd_soc_pcm_runtime *fe,
......
...@@ -1328,15 +1328,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) ...@@ -1328,15 +1328,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
/* add DPCM sysfs entries */ /* add DPCM sysfs entries */
if (dai_link->dynamic) { if (dai_link->dynamic)
ret = soc_dpcm_debugfs_add(rtd); soc_dpcm_debugfs_add(rtd);
if (ret < 0) {
dev_err(rtd->dev,
"ASoC: failed to add dpcm sysfs entries: %d\n",
ret);
return ret;
}
}
#endif #endif
if (cpu_dai->driver->compress_dai) { if (cpu_dai->driver->compress_dai) {
......
...@@ -2802,10 +2802,10 @@ static const struct file_operations dpcm_state_fops = { ...@@ -2802,10 +2802,10 @@ static const struct file_operations dpcm_state_fops = {
.llseek = default_llseek, .llseek = default_llseek,
}; };
int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
{ {
if (!rtd->dai_link) if (!rtd->dai_link)
return 0; return;
rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name, rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name,
rtd->card->debugfs_card_root); rtd->card->debugfs_card_root);
...@@ -2813,13 +2813,11 @@ int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) ...@@ -2813,13 +2813,11 @@ int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
dev_dbg(rtd->dev, dev_dbg(rtd->dev,
"ASoC: Failed to create dpcm debugfs directory %s\n", "ASoC: Failed to create dpcm debugfs directory %s\n",
rtd->dai_link->name); rtd->dai_link->name);
return -EINVAL; return;
} }
rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444, rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444,
rtd->debugfs_dpcm_root, rtd->debugfs_dpcm_root,
rtd, &dpcm_state_fops); rtd, &dpcm_state_fops);
return 0;
} }
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment