]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: remove snd_soc_pcm_subclass
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 27 Feb 2026 01:17:19 +0000 (01:17 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 27 Feb 2026 01:20:13 +0000 (01:20 +0000)
enum snd_soc_pcm_subclass has added at v3.1 commit b8c0dab9bf337 ("ASoC:
core - PCM mutex per rtd"), but has never been used during this 15 years.
Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/878qcfyogw.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc.h

index 7bf7ce085516a87fce2bd5129db32dc631f39ce5..b1c5dad26edb19e104f43d2594f11fd2b464b351 100644 (file)
@@ -422,11 +422,6 @@ struct snd_soc_jack_pin;
 #include <sound/soc-dpcm.h>
 #include <sound/soc-topology.h>
 
-enum snd_soc_pcm_subclass {
-       SND_SOC_PCM_CLASS_PCM   = 0,
-       SND_SOC_PCM_CLASS_BE    = 1,
-};
-
 int snd_soc_register_card(struct snd_soc_card *card);
 void snd_soc_unregister_card(struct snd_soc_card *card);
 int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card);
@@ -999,7 +994,6 @@ struct snd_soc_card {
 
        /* Mutex for PCM operations */
        struct mutex pcm_mutex;
-       enum snd_soc_pcm_subclass pcm_subclass;
 
        int (*probe)(struct snd_soc_card *card);
        int (*late_probe)(struct snd_soc_card *card);
@@ -1519,7 +1513,7 @@ static inline void _snd_soc_dapm_mutex_assert_held_d(struct snd_soc_dapm_context
  */
 static inline void _snd_soc_dpcm_mutex_lock_c(struct snd_soc_card *card)
 {
-       mutex_lock_nested(&card->pcm_mutex, card->pcm_subclass);
+       mutex_lock(&card->pcm_mutex);
 }
 
 static inline void _snd_soc_dpcm_mutex_unlock_c(struct snd_soc_card *card)