ASoC: soc-pcm: add soc_rtd_hw_free()

Add soc_rtd_hw_free() to make the code easier to read

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/8736c8mi9n.wl-kuninori.morimoto.gx@renesas.com
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index d7fc6c5d79069fddf0a62e0331230ad3cc26455d..718749f12979ba09de5090a3f90998184c12c33b 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -64,6 +64,14 @@ static int soc_rtd_hw_params(struct snd_soc_pcm_runtime *rtd,
        return 0;
 }
 
+static void soc_rtd_hw_free(struct snd_soc_pcm_runtime *rtd,
+                           struct snd_pcm_substream *substream)
+{
+       if (rtd->dai_link->ops &&
+           rtd->dai_link->ops->hw_free)
+               rtd->dai_link->ops->hw_free(substream);
+}
+
 /**
  * snd_soc_runtime_activate() - Increment active count for PCM runtime components
  * @rtd: ASoC PCM runtime that is activated
@@ -935,8 +943,7 @@ codec_err:
                codec_dai->rate = 0;
        }
 
-       if (rtd->dai_link->ops->hw_free)
-               rtd->dai_link->ops->hw_free(substream);
+       soc_rtd_hw_free(rtd, substream);
 
        mutex_unlock(&rtd->card->pcm_mutex);
        return ret;
@@ -979,8 +986,7 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
        }
 
        /* free any machine hw params */
-       if (rtd->dai_link->ops->hw_free)
-               rtd->dai_link->ops->hw_free(substream);
+       soc_rtd_hw_free(rtd, substream);
 
        /* free any component resources */
        soc_pcm_components_hw_free(substream, NULL);