Merge tag 'for-5.13/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / sound / soc / soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b005f9e..91bf939 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3831,11 +3831,9 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
                source = path->source->priv;
 
                ret = snd_soc_dai_startup(source, substream);
-               if (ret < 0) {
-                       dev_err(source->dev,
-                               "ASoC: startup() failed: %d\n", ret);
+               if (ret < 0)
                        goto out;
-               }
+
                snd_soc_dai_activate(source, substream->stream);
        }
 
@@ -3844,11 +3842,9 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
                sink = path->sink->priv;
 
                ret = snd_soc_dai_startup(sink, substream);
-               if (ret < 0) {
-                       dev_err(sink->dev,
-                               "ASoC: startup() failed: %d\n", ret);
+               if (ret < 0)
                        goto out;
-               }
+
                snd_soc_dai_activate(sink, substream->stream);
        }
 
@@ -3943,11 +3939,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                snd_soc_dapm_widget_for_each_sink_path(w, path) {
                        sink = path->sink->priv;
 
-                       ret = snd_soc_dai_digital_mute(sink, 0,
-                                                      SNDRV_PCM_STREAM_PLAYBACK);
-                       if (ret != 0 && ret != -ENOTSUPP)
-                               dev_warn(sink->dev,
-                                        "ASoC: Failed to unmute: %d\n", ret);
+                       snd_soc_dai_digital_mute(sink, 0, SNDRV_PCM_STREAM_PLAYBACK);
                        ret = 0;
                }
                break;
@@ -3956,11 +3948,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                snd_soc_dapm_widget_for_each_sink_path(w, path) {
                        sink = path->sink->priv;
 
-                       ret = snd_soc_dai_digital_mute(sink, 1,
-                                                      SNDRV_PCM_STREAM_PLAYBACK);
-                       if (ret != 0 && ret != -ENOTSUPP)
-                               dev_warn(sink->dev,
-                                        "ASoC: Failed to mute: %d\n", ret);
+                       snd_soc_dai_digital_mute(sink, 1, SNDRV_PCM_STREAM_PLAYBACK);
                        ret = 0;
                }