ASoC: expand snd_soc_dpcm_mutex_lock/unlock()

soc-pcm.c has snd_soc_dpcm_mutex_lock/unlock(),
but other files can't use it because it is static function.

It requests snd_soc_pcm_runtime as parameter (A), but sometimes we
want to use it by snd_soc_card (B).

(A)	static inline void snd_soc_dpcm_mutex_lock(struct snd_soc_pcm_runtime *rtd)
	{
		mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
	}			   ^^^^^^^^^

(B)	mutex_lock_nested(&card->pcm_mutex, card->pcm_subclass);
			   ^^^^

We want to use it with both "rtd" and "card" for dapm lock/unlock.
To enable it, this patch uses _Generic macro.

This patch makes snd_soc_dpcm_mutex_{un}lock() global function, and use it on
each files.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87bkk1x3ud.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 0e17e32..05004c0 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1425,6 +1425,51 @@ static inline void _snd_soc_dapm_mutex_assert_held_d(struct snd_soc_dapm_context
        struct snd_soc_card * :         _snd_soc_dapm_mutex_assert_held_c, \
        struct snd_soc_dapm_context * : _snd_soc_dapm_mutex_assert_held_d)(x)
 
+/*
+ *     PCM helper functions
+ */
+static inline void _snd_soc_dpcm_mutex_lock_c(struct snd_soc_card *card)
+{
+       mutex_lock_nested(&card->pcm_mutex, card->pcm_subclass);
+}
+
+static inline void _snd_soc_dpcm_mutex_unlock_c(struct snd_soc_card *card)
+{
+       mutex_unlock(&card->pcm_mutex);
+}
+
+static inline void _snd_soc_dpcm_mutex_assert_held_c(struct snd_soc_card *card)
+{
+       lockdep_assert_held(&card->pcm_mutex);
+}
+
+static inline void _snd_soc_dpcm_mutex_lock_r(struct snd_soc_pcm_runtime *rtd)
+{
+       _snd_soc_dpcm_mutex_lock_c(rtd->card);
+}
+
+static inline void _snd_soc_dpcm_mutex_unlock_r(struct snd_soc_pcm_runtime *rtd)
+{
+       _snd_soc_dpcm_mutex_unlock_c(rtd->card);
+}
+
+static inline void _snd_soc_dpcm_mutex_assert_held_r(struct snd_soc_pcm_runtime *rtd)
+{
+       _snd_soc_dpcm_mutex_assert_held_c(rtd->card);
+}
+
+#define snd_soc_dpcm_mutex_lock(x) _Generic((x),                       \
+        struct snd_soc_card * :        _snd_soc_dpcm_mutex_lock_c,     \
+        struct snd_soc_pcm_runtime * : _snd_soc_dpcm_mutex_lock_r)(x)
+
+#define snd_soc_dpcm_mutex_unlock(x) _Generic((x),                     \
+        struct snd_soc_card * :        _snd_soc_dpcm_mutex_unlock_c,   \
+        struct snd_soc_pcm_runtime * : _snd_soc_dpcm_mutex_unlock_r)(x)
+
+#define snd_soc_dpcm_mutex_assert_held(x) _Generic((x),                \
+       struct snd_soc_card * :         _snd_soc_dpcm_mutex_assert_held_c, \
+       struct snd_soc_pcm_runtime * :  _snd_soc_dpcm_mutex_assert_held_r)(x)
+
 #include <sound/soc-component.h>
 #include <sound/soc-card.h>
 #include <sound/soc-jack.h>

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 3cd6952..ff25718 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -550,7 +550,7 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
        struct snd_soc_component *component;
        int i, ret = 0;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        for_each_rtd_components(rtd, i, component) {
                if (component->driver->compress_ops &&
@@ -561,7 +561,7 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
                }
        }
 
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
 
        return soc_component_ret(component, ret);
 }
@@ -574,7 +574,7 @@ int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,
        struct snd_soc_component *component;
        int i, ret = 0;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        for_each_rtd_components(rtd, i, component) {
                if (component->driver->compress_ops &&
@@ -585,7 +585,7 @@ int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,
                }
        }
 
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
 
        return soc_component_ret(component, ret);
 }
@@ -638,7 +638,7 @@ int snd_soc_component_compr_copy(struct snd_compr_stream *cstream,
        struct snd_soc_component *component;
        int i, ret = 0;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        for_each_rtd_components(rtd, i, component) {
                if (component->driver->compress_ops &&
@@ -649,7 +649,7 @@ int snd_soc_component_compr_copy(struct snd_compr_stream *cstream,
                }
        }
 
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
 
        return soc_component_ret(component, ret);
 }

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 6e74a6c..661e9d7 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -62,7 +62,7 @@ static int soc_compr_clean(struct snd_compr_stream *cstream, int rollback)
        struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
        int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        if (!rollback)
                snd_soc_runtime_deactivate(rtd, stream);
@@ -84,7 +84,7 @@ static int soc_compr_clean(struct snd_compr_stream *cstream, int rollback)
        if (!rollback)
                snd_soc_dapm_stream_stop(rtd, stream);
 
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
 
        snd_soc_pcm_component_pm_runtime_put(rtd, cstream, rollback);
 
@@ -107,7 +107,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
        if (ret < 0)
                goto err_no_lock;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        ret = snd_soc_dai_compr_startup(cpu_dai, cstream);
        if (ret < 0)
@@ -123,7 +123,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
 
        snd_soc_runtime_activate(rtd, stream);
 err:
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
 err_no_lock:
        if (ret < 0)
                soc_compr_clean(cstream, 1);
@@ -146,7 +146,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
        if (ret < 0)
                goto be_err;
 
-       mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(fe);
 
        /* calculate valid and active FE <-> BE dpcms */
        dpcm_process_paths(fe, stream, &list, 1);
@@ -182,7 +182,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
        fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 
        snd_soc_runtime_activate(fe, stream);
-       mutex_unlock(&fe->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(fe);
 
        mutex_unlock(&fe->card->mutex);
 
@@ -209,7 +209,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
 
        mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
 
-       mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(fe);
        snd_soc_runtime_deactivate(fe, stream);
 
        fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;
@@ -229,7 +229,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
 
        dpcm_be_disconnect(fe, stream);
 
-       mutex_unlock(&fe->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(fe);
 
        snd_soc_link_compr_shutdown(cstream, 0);
 
@@ -249,7 +249,7 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
        int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */
        int ret;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        ret = snd_soc_component_compr_trigger(cstream, cmd);
        if (ret < 0)
@@ -269,7 +269,7 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
        }
 
 out:
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
        return ret;
 }
 
@@ -327,7 +327,7 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
        int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */
        int ret;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        /*
         * First we call set_params for the CPU DAI, then the component
@@ -352,14 +352,14 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
 
        /* cancel any delayed stream shutdown that is pending */
        rtd->pop_wait = 0;
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
 
        cancel_delayed_work_sync(&rtd->delayed_work);
 
        return 0;
 
 err:
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
        return ret;
 }
 
@@ -404,9 +404,9 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
        ret = snd_soc_link_compr_set_params(cstream);
        if (ret < 0)
                goto out;
-       mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(fe);
        dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);
-       mutex_unlock(&fe->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(fe);
        fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE;
 
 out:
@@ -422,7 +422,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream,
        struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
        int ret = 0;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        ret = snd_soc_dai_compr_get_params(cpu_dai, cstream, params);
        if (ret < 0)
@@ -430,7 +430,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream,
 
        ret = snd_soc_component_compr_get_params(cstream, params);
 err:
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
        return ret;
 }
 
@@ -440,7 +440,7 @@ static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
        struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
        int ret;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        ret = snd_soc_dai_compr_ack(cpu_dai, cstream, bytes);
        if (ret < 0)
@@ -448,7 +448,7 @@ static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
 
        ret = snd_soc_component_compr_ack(cstream, bytes);
 err:
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
        return ret;
 }
 
@@ -459,7 +459,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
        int ret;
        struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        ret = snd_soc_dai_compr_pointer(cpu_dai, cstream, tstamp);
        if (ret < 0)
@@ -467,7 +467,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
 
        ret = snd_soc_component_compr_pointer(cstream, tstamp);
 out:
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
        return ret;
 }
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9bbcff4..4594505 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -348,7 +348,7 @@ void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
        int playback = SNDRV_PCM_STREAM_PLAYBACK;
 
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(rtd);
 
        dev_dbg(rtd->dev,
                "ASoC: pop wq checking: %s status: %s waiting: %s\n",
@@ -364,7 +364,7 @@ void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd)
                                          SND_SOC_DAPM_STREAM_STOP);
        }
 
-       mutex_unlock(&rtd->card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(rtd);
 }
 EXPORT_SYMBOL_GPL(snd_soc_close_delayed_work);
 

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 913a7d9..adb69d7 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -49,19 +49,6 @@ static inline int _soc_pcm_ret(struct snd_soc_pcm_runtime *rtd,
        return ret;
 }
 
-static inline void snd_soc_dpcm_mutex_lock(struct snd_soc_pcm_runtime *rtd)
-{
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
-}
-
-static inline void snd_soc_dpcm_mutex_unlock(struct snd_soc_pcm_runtime *rtd)
-{
-       mutex_unlock(&rtd->card->pcm_mutex);
-}
-
-#define snd_soc_dpcm_mutex_assert_held(rtd) \
-       lockdep_assert_held(&(rtd)->card->pcm_mutex)
-
 static inline void snd_soc_dpcm_stream_lock_irq(struct snd_soc_pcm_runtime *rtd,
                                                int stream)
 {
@@ -2664,7 +2651,7 @@ int snd_soc_dpcm_runtime_update(struct snd_soc_card *card)
        struct snd_soc_pcm_runtime *fe;
        int ret = 0;
 
-       mutex_lock_nested(&card->pcm_mutex, card->pcm_subclass);
+       snd_soc_dpcm_mutex_lock(card);
        /* shutdown all old paths first */
        for_each_card_rtds(card, fe) {
                ret = soc_dpcm_fe_runtime_update(fe, 0);
@@ -2680,7 +2667,7 @@ int snd_soc_dpcm_runtime_update(struct snd_soc_card *card)
        }
 
 out:
-       mutex_unlock(&card->pcm_mutex);
+       snd_soc_dpcm_mutex_unlock(card);
        return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dpcm_runtime_update);