ASoC: soc-dai: add snd_soc_dai_hw_free()

Current ALSA SoC is directly using dai->driver->ops->xxx,
thus, it has deep nested bracket, and it makes code unreadable.
This patch adds new snd_soc_dai_hw_free() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87y30qhn4w.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 3773262a1b77d7cfbd6dccbebc20b69ec38149d2..5222b6a758f2d58360ad5c6998b84e6bd15d7a8b 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -148,6 +148,8 @@ int snd_soc_dai_is_dummy(struct snd_soc_dai *dai);
 int snd_soc_dai_hw_params(struct snd_soc_dai *dai,
                          struct snd_pcm_substream *substream,
                          struct snd_pcm_hw_params *params);
+void snd_soc_dai_hw_free(struct snd_soc_dai *dai,
+                        struct snd_pcm_substream *substream);
 
 struct snd_soc_dai_ops {
        /*

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index f883d27d136fd9f4be2f96664051fb3b28a16a07..39a685e6acd5b95dfc2c8104c8cb9f3c07d5ee67 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -282,3 +282,10 @@ int snd_soc_dai_hw_params(struct snd_soc_dai *dai,
 
        return 0;
 }
+
+void snd_soc_dai_hw_free(struct snd_soc_dai *dai,
+                        struct snd_pcm_substream *substream)
+{
+       if (dai->driver->ops->hw_free)
+               dai->driver->ops->hw_free(substream, dai);
+}

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 8fc6a01f5d8be3a18b157ea9f2569e938af42424..0783b05133adc77ddebeff03b1888d3aad35d159 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3898,9 +3898,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                snd_soc_dapm_widget_for_each_source_path(w, path) {
                        source = path->source->priv;
 
-                       if (source->driver->ops->hw_free)
-                               source->driver->ops->hw_free(&substream,
-                                                            source);
+                       snd_soc_dai_hw_free(source, &substream);
 
                        source->active--;
                        if (source->driver->ops->shutdown)
@@ -3912,8 +3910,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;
 
-                       if (sink->driver->ops->hw_free)
-                               sink->driver->ops->hw_free(&substream, sink);
+                       snd_soc_dai_hw_free(sink, &substream);
 
                        sink->active--;
                        if (sink->driver->ops->shutdown)

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 420cc94e0a468532d472b0b0a02bcc26cf588ffb..58fc4e98ab59c4c6026ab6054b02d7694ff5f4be 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1011,8 +1011,7 @@ out:
 component_err:
        soc_pcm_components_hw_free(substream, component);
 
-       if (cpu_dai->driver->ops->hw_free)
-               cpu_dai->driver->ops->hw_free(substream, cpu_dai);
+       snd_soc_dai_hw_free(cpu_dai, substream);
        cpu_dai->rate = 0;
 
 interface_err:
@@ -1023,8 +1022,7 @@ codec_err:
                if (!snd_soc_dai_stream_valid(codec_dai, substream->stream))
                        continue;
 
-               if (codec_dai->driver->ops->hw_free)
-                       codec_dai->driver->ops->hw_free(substream, codec_dai);
+               snd_soc_dai_hw_free(codec_dai, substream);
                codec_dai->rate = 0;
        }
 
@@ -1083,12 +1081,10 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
                if (!snd_soc_dai_stream_valid(codec_dai, substream->stream))
                        continue;
 
-               if (codec_dai->driver->ops->hw_free)
-                       codec_dai->driver->ops->hw_free(substream, codec_dai);
+               snd_soc_dai_hw_free(codec_dai, substream);
        }
 
-       if (cpu_dai->driver->ops->hw_free)
-               cpu_dai->driver->ops->hw_free(substream, cpu_dai);
+       snd_soc_dai_hw_free(cpu_dai, substream);
 
        mutex_unlock(&rtd->pcm_mutex);
        return 0;