diff options
| -rw-r--r-- | include/sound/soc-dpcm.h | 2 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 11 | ||||
| -rw-r--r-- | sound/soc/soc-pcm.c | 8 |
3 files changed, 6 insertions, 15 deletions
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index 98f2ade0266e..806059052bfc 100644 --- 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, | |||
| 135 | 135 | ||
| 136 | /* internal use only */ | 136 | /* internal use only */ |
| 137 | int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute); | 137 | int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute); |
| 138 | int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); | 138 | void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); |
| 139 | int soc_dpcm_runtime_update(struct snd_soc_card *); | 139 | int soc_dpcm_runtime_update(struct snd_soc_card *); |
| 140 | 140 | ||
| 141 | int dpcm_path_get(struct snd_soc_pcm_runtime *fe, | 141 | 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 3f18fa7f090d..d29c68ad83c7 100644 --- 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) | |||
| 1328 | 1328 | ||
| 1329 | #ifdef CONFIG_DEBUG_FS | 1329 | #ifdef CONFIG_DEBUG_FS |
| 1330 | /* add DPCM sysfs entries */ | 1330 | /* add DPCM sysfs entries */ |
| 1331 | if (dai_link->dynamic) { | 1331 | if (dai_link->dynamic) |
| 1332 | ret = soc_dpcm_debugfs_add(rtd); | 1332 | soc_dpcm_debugfs_add(rtd); |
| 1333 | if (ret < 0) { | ||
| 1334 | dev_err(rtd->dev, | ||
| 1335 | "ASoC: failed to add dpcm sysfs entries: %d\n", | ||
| 1336 | ret); | ||
| 1337 | return ret; | ||
| 1338 | } | ||
| 1339 | } | ||
| 1340 | #endif | 1333 | #endif |
| 1341 | 1334 | ||
| 1342 | if (cpu_dai->driver->compress_dai) { | 1335 | if (cpu_dai->driver->compress_dai) { |
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 6b0136e7cb88..9c514fde7154 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c | |||
| @@ -2802,10 +2802,10 @@ static const struct file_operations dpcm_state_fops = { | |||
| 2802 | .llseek = default_llseek, | 2802 | .llseek = default_llseek, |
| 2803 | }; | 2803 | }; |
| 2804 | 2804 | ||
| 2805 | int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) | 2805 | void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) |
| 2806 | { | 2806 | { |
| 2807 | if (!rtd->dai_link) | 2807 | if (!rtd->dai_link) |
| 2808 | return 0; | 2808 | return; |
| 2809 | 2809 | ||
| 2810 | rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name, | 2810 | rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name, |
| 2811 | rtd->card->debugfs_card_root); | 2811 | rtd->card->debugfs_card_root); |
| @@ -2813,13 +2813,11 @@ int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) | |||
| 2813 | dev_dbg(rtd->dev, | 2813 | dev_dbg(rtd->dev, |
| 2814 | "ASoC: Failed to create dpcm debugfs directory %s\n", | 2814 | "ASoC: Failed to create dpcm debugfs directory %s\n", |
| 2815 | rtd->dai_link->name); | 2815 | rtd->dai_link->name); |
| 2816 | return -EINVAL; | 2816 | return; |
| 2817 | } | 2817 | } |
| 2818 | 2818 | ||
| 2819 | rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444, | 2819 | rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444, |
| 2820 | rtd->debugfs_dpcm_root, | 2820 | rtd->debugfs_dpcm_root, |
| 2821 | rtd, &dpcm_state_fops); | 2821 | rtd, &dpcm_state_fops); |
| 2822 | |||
| 2823 | return 0; | ||
| 2824 | } | 2822 | } |
| 2825 | #endif | 2823 | #endif |
