ASoC: soc-core: add snd_soc_close_delayed_work()

We need to setup rtd->close_delayed_work_func.
It will be set at snd_soc_dai_compress_new() or soc_new_pcm().
But these setups close_delayed_work() which is same name /
same implemantaion, but different local code.
To reduce duplicate code, this patch moves it as
snd_soc_close_delayed_work() and share same code.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-By: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/8736cot4v2.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0513f30a0209952eecb8265d8685c27d427a9e60..f0e4f36f83bfa7d349f54d278cc46e5db235d8bb 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1159,6 +1159,7 @@ struct snd_soc_pcm_runtime {
 #define for_each_rtd_codec_dai_rollback(rtd, i, dai)           \
        for (; ((--i) >= 0) && ((dai) = rtd->codec_dais[i]);)
 
+void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);
 
 /* mixer control */
 struct soc_mixer_control {

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 16fe08690cf572419ddfc94587efd85987d33c70..72494717dde301b1803c84c27a2daa5e7bf32a39 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -226,33 +226,6 @@ be_err:
        return ret;
 }
 
-/*
- * Power down the audio subsystem pmdown_time msecs after close is called.
- * This is to ensure there are no pops or clicks in between any music tracks
- * due to DAPM power cycling.
- */
-static void close_delayed_work(struct snd_soc_pcm_runtime *rtd)
-{
-       struct snd_soc_dai *codec_dai = rtd->codec_dai;
-
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
-
-       dev_dbg(rtd->dev,
-               "Compress ASoC: pop wq checking: %s status: %s waiting: %s\n",
-               codec_dai->driver->playback.stream_name,
-               codec_dai->playback_active ? "active" : "inactive",
-               rtd->pop_wait ? "yes" : "no");
-
-       /* are we waiting on this codec DAI stream */
-       if (rtd->pop_wait == 1) {
-               rtd->pop_wait = 0;
-               snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
-                                         SND_SOC_DAPM_STREAM_STOP);
-       }
-
-       mutex_unlock(&rtd->card->pcm_mutex);
-}
-
 static int soc_compr_free(struct snd_compr_stream *cstream)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
@@ -941,7 +914,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
        }
 
        /* DAPM dai link stream work */
-       rtd->close_delayed_work_func = close_delayed_work;
+       rtd->close_delayed_work_func = snd_soc_close_delayed_work;
 
        rtd->compr = compr;
        compr->private_data = rtd;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3c729eaf0bbfc2ac2ff97b5f8d2768cb94d2b157..acf6f141fd2deb925105d4977b162c85636bae60 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -359,6 +359,34 @@ struct snd_soc_pcm_runtime
 }
 EXPORT_SYMBOL_GPL(snd_soc_get_pcm_runtime);
 
+/*
+ * Power down the audio subsystem pmdown_time msecs after close is called.
+ * This is to ensure there are no pops or clicks in between any music tracks
+ * due to DAPM power cycling.
+ */
+void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+
+       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+
+       dev_dbg(rtd->dev,
+               "ASoC: pop wq checking: %s status: %s waiting: %s\n",
+               codec_dai->driver->playback.stream_name,
+               codec_dai->playback_active ? "active" : "inactive",
+               rtd->pop_wait ? "yes" : "no");
+
+       /* are we waiting on this codec DAI stream */
+       if (rtd->pop_wait == 1) {
+               rtd->pop_wait = 0;
+               snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
+                                         SND_SOC_DAPM_STREAM_STOP);
+       }
+
+       mutex_unlock(&rtd->card->pcm_mutex);
+}
+EXPORT_SYMBOL_GPL(snd_soc_close_delayed_work);
+
 static void soc_release_rtd_dev(struct device *dev)
 {
        /* "dev" means "rtd->dev" */

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 68f72051f8e30893fdb25ca7ab4f1867f925fc7e..ad908e008b2fb75d9f6633419c93ea396a5d35d0 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -624,32 +624,6 @@ out:
        return ret;
 }
 
-/*
- * Power down the audio subsystem pmdown_time msecs after close is called.
- * This is to ensure there are no pops or clicks in between any music tracks
- * due to DAPM power cycling.
- */
-static void close_delayed_work(struct snd_soc_pcm_runtime *rtd)
-{
-       struct snd_soc_dai *codec_dai = rtd->codec_dais[0];
-
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
-
-       dev_dbg(rtd->dev, "ASoC: pop wq checking: %s status: %s waiting: %s\n",
-                codec_dai->driver->playback.stream_name,
-                codec_dai->playback_active ? "active" : "inactive",
-                rtd->pop_wait ? "yes" : "no");
-
-       /* are we waiting on this codec DAI stream */
-       if (rtd->pop_wait == 1) {
-               rtd->pop_wait = 0;
-               snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
-                                         SND_SOC_DAPM_STREAM_STOP);
-       }
-
-       mutex_unlock(&rtd->card->pcm_mutex);
-}
-
 static void codec2codec_close_delayed_work(struct snd_soc_pcm_runtime *rtd)
 {
        /*
@@ -2956,7 +2930,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
        if (rtd->dai_link->params)
                rtd->close_delayed_work_func = codec2codec_close_delayed_work;
        else
-               rtd->close_delayed_work_func = close_delayed_work;
+               rtd->close_delayed_work_func = snd_soc_close_delayed_work;
 
        pcm->nonatomic = rtd->dai_link->nonatomic;
        rtd->pcm = pcm;