ASoC: core: Rename card mutex subclass to better align with usage.
PATCH 1/2 ASoC: core: Rename card mutex subclass to better align with usage.
Change SND_SOC_CARD_CLASS_PCM to SND_SOC_CARD_CLASS_RUNTIME to better describe all uses for this mutex subclass and align with DAPM too.
Signed-off-by Liam Girdwood <[email protected]>
--- include/sound/soc.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
include/sound/soc.h +2 -2
@@ -289,8 +289,8 @@ enum snd_soc_pcm_subclass { };enum snd_soc_card_subclass { -SND_SOC_CARD_CLASS_INIT =0 , -SND_SOC_CARD_CLASS_PCM =1 , +SND_SOC_CARD_CLASS_INIT =0 , +SND_SOC_CARD_CLASS_RUNTIME =1 , }; int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id,
Signature · 1 line
1.7.5.4
PATCH 2/2 ASoC: dapm: Rename dapm mutex subclass to better match usage.
Rename SND_SOC_DAPM_CLASS_PCM to SND_SOC_DAPM_CLASS_RUNTIME to better match the usage and align with card mutex too.
Signed-off-by Liam Girdwood <[email protected]>
--- include/sound/soc-dapm.h | 4 ++-- sound/soc/soc-dapm.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-)
include/sound/soc-dapm.h +2 -2
@@ -432,8 +432,8 @@ enum snd_soc_dapm_type { };enum snd_soc_dapm_subclass { -SND_SOC_DAPM_CLASS_INIT =0 , -SND_SOC_DAPM_CLASS_PCM =1 , +SND_SOC_DAPM_CLASS_INIT =0 , +SND_SOC_DAPM_CLASS_RUNTIME =1 , };/*
sound/soc/soc-dapm.c +10 -10
@@ -1787,7 +1787,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_widget *widget,struct snd_soc_card *card = widget->dapm->card;int ret; -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); ret =soc_dapm_mux_update_power (widget, kcontrol, mux, e);mutex_unlock (&card->dapm_mutex);return ret;
@@ -1831,7 +1831,7 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,struct snd_soc_card *card = widget->dapm->card;int ret; -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); ret =soc_dapm_mixer_update_power (widget, kcontrol, connect);mutex_unlock (&card->dapm_mutex);return ret;
@@ -2004,7 +2004,7 @@ int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm)if (!dapm->card || !dapm->card->instantiated)return 0 ; -mutex_lock_nested (&dapm->card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&dapm->card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); ret =dapm_power_widgets (dapm,SND_SOC_DAPM_STREAM_NOP );mutex_unlock (&dapm->card->dapm_mutex);return ret;
@@ -2423,7 +2423,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,/* old connection must be powered down */ connect = invert ?1 :0 ; -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); change =snd_soc_test_bits (widget->codec, reg, mask, val);if (change) {
@@ -2515,7 +2515,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, mask |= (bitmask -1 ) << e->shift_r; } -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); change =snd_soc_test_bits (widget->codec, e->reg, mask, val);if (change) {
@@ -2584,7 +2584,7 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,if (ucontrol->value.enumerated.item[0 ] >= e->max)return -EINVAL ; -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); change = widget->value != ucontrol->value.enumerated.item[0 ];if (change) {
@@ -2681,7 +2681,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol, mask |= e->mask << e->shift_r; } -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); change =snd_soc_test_bits (widget->codec, e->reg, mask, val);if (change) {
@@ -2740,7 +2740,7 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,struct snd_soc_card *card =snd_kcontrol_chip (kcontrol);const char *pin = (const char *)kcontrol->private_value; -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); ucontrol->value.integer.value[0 ] =snd_soc_dapm_get_pin_status (&card->dapm, pin);
@@ -2763,7 +2763,7 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,struct snd_soc_card *card =snd_kcontrol_chip (kcontrol);const char *pin = (const char *)kcontrol->private_value; -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME );if (ucontrol->value.integer.value[0 ])snd_soc_dapm_enable_pin (&card->dapm, pin);
@@ -3082,7 +3082,7 @@ void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, {struct snd_soc_card *card = rtd->card; -mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_PCM ); +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME );soc_dapm_stream_event (rtd, stream, event);mutex_unlock (&card->dapm_mutex); }
Signature · 1 line
1.7.5.4
Mark Brown
AppliedQuoted 2 lines · Liam Girdwood
Change
SND_SOC_CARD_CLASS_PCMtoSND_SOC_CARD_CLASS_RUNTIMEto better describe all uses for this mutex subclass and align with DAPM too.
Applied both, thanks.