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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h
index 98f2ade0266eb9a28ae6340b2908bd8fabea0eca..806059052bfcca4aa9d46ff3b0f061442136e84f 100644 (file)
--- a/include/sound/soc-dpcm.h
+++ b/include/sound/soc-dpcm.h
@@ -135,7 +135,7 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream,
 
 /* internal use only */
 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 dpcm_path_get(struct snd_soc_pcm_runtime *fe,

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3f18fa7f090deca4c6026238a3f7611527cd1046..d29c68ad83c7284e3d064e75d63e29f353eaac45 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1328,15 +1328,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
 
 #ifdef CONFIG_DEBUG_FS
        /* add DPCM sysfs entries */
-       if (dai_link->dynamic) {
-               ret = soc_dpcm_debugfs_add(rtd);
-               if (ret < 0) {
-                       dev_err(rtd->dev,
-                               "ASoC: failed to add dpcm sysfs entries: %d\n",
-                               ret);
-                       return ret;
-               }
-       }
+       if (dai_link->dynamic)
+               soc_dpcm_debugfs_add(rtd);
 #endif
 
        if (cpu_dai->driver->compress_dai) {

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 6b0136e7cb88c2cebd96b12a6a85dc200f9838d3..9c514fde71542f7bd44809a8c7d1c019013c8123 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2802,10 +2802,10 @@ static const struct file_operations dpcm_state_fops = {
        .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)
-               return 0;
+               return;
 
        rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name,
                        rtd->card->debugfs_card_root);
@@ -2813,13 +2813,11 @@ int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
                dev_dbg(rtd->dev,
                         "ASoC: Failed to create dpcm debugfs directory %s\n",
                         rtd->dai_link->name);
-               return -EINVAL;
+               return;
        }
 
        rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444,
                                                rtd->debugfs_dpcm_root,
                                                rtd, &dpcm_state_fops);
-
-       return 0;
 }
 #endif