ASoC: DAPM - Export mixer|mux_update_power() to public API.
PATCH v2 1/1 ASoC: DAPM - Export mixer|mux_update_power() to public API.
Allow for the operation of custom mixer and mux DAPM widgets that can call snd_soc_dapm_mixer_update_power() and snd_soc_dapm_mux_update_power() directly after updating their status. This is useful with complex DAPM Mixer operations where we need to do additional work in addition to setting a few mixer register bits.
Changes since V1:-
o Remove the unused "change" flag parameter from snd_soc_dapm_mux_update_power().
Signed-off-by Liam Girdwood <[email protected]>
--- include/sound/soc-dapm.h | 6 ++++++ sound/soc/soc-dapm.c | 21 +++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-)
include/sound/soc-dapm.h +6 -0
@@ -365,6 +365,12 @@ int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, const char *stream, int event);void snd_soc_dapm_shutdown (struct snd_soc_card *card); +/* external DAPM widget events */ +int snd_soc_dapm_mixer_update_power (struct snd_soc_dapm_widget *widget, +struct snd_kcontrol *kcontrol,int connect); +int snd_soc_dapm_mux_update_power (struct snd_soc_dapm_widget *widget, +struct snd_kcontrol *kcontrol,int mux,struct soc_enum *e); +/* dapm sys fs - used by the core */ int snd_soc_dapm_sys_add (struct device *dev); void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
sound/soc/soc-dapm.c +9 -12
@@ -1659,9 +1659,8 @@ static inline void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)#endif /* test and update the power status of a mux widget */ -static int dapm_mux_update_power (struct snd_soc_dapm_widget *widget, -struct snd_kcontrol *kcontrol,int change, -int mux,struct soc_enum *e) +int snd_soc_dapm_mux_update_power (struct snd_soc_dapm_widget *widget, +struct snd_kcontrol *kcontrol,int mux,struct soc_enum *e) {struct snd_soc_dapm_path *path;int found =0 ;
@@ -1671,9 +1670,6 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget, widget->id != snd_soc_dapm_value_mux)return -ENODEV ; -if (!change) -return 0 ; -/* find dapm widget path assoc with kcontrol */ list_for_each_entry (path, &widget->dapm->card->paths, list) {if (path->kcontrol != kcontrol)
@@ -1702,9 +1698,10 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,return 0 ; } +EXPORT_SYMBOL_GPL (snd_soc_dapm_mux_update_power);/* test and update the power status of a mixer or switch widget */ -static int dapm_mixer_update_power (struct snd_soc_dapm_widget *widget, +int snd_soc_dapm_mixer_update_power (struct snd_soc_dapm_widget *widget,struct snd_kcontrol *kcontrol,int connect) {struct snd_soc_dapm_path *path;
@@ -1733,6 +1730,7 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,return 0 ; } +EXPORT_SYMBOL_GPL (snd_soc_dapm_mixer_update_power);/* show dapm widget status in sys fs */ static ssize_t dapm_widget_show(struct device *dev,
@@ -2315,7 +2313,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, update.val = val; widget->dapm->update = &update; -dapm_mixer_update_power (widget, kcontrol, connect); +snd_soc_dapm_mixer_update_power (widget, kcontrol, connect); widget->dapm->update =NULL ; }
@@ -2406,7 +2404,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, update.val = val; widget->dapm->update = &update; -dapm_mux_update_power (widget, kcontrol, change, mux, e); +snd_soc_dapm_mux_update_power (widget, kcontrol, mux, e); widget->dapm->update =NULL ; }
@@ -2467,8 +2465,7 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol, widget->value = ucontrol->value.enumerated.item[0 ]; -dapm_mux_update_power (widget, kcontrol, change, - widget->value, e); +snd_soc_dapm_mux_update_power (widget, kcontrol, widget->value, e); } }
@@ -2571,7 +2568,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol, update.val = val; widget->dapm->update = &update; -dapm_mux_update_power (widget, kcontrol, change, mux, e); +snd_soc_dapm_mux_update_power (widget, kcontrol, mux, e); widget->dapm->update =NULL ; }
Signature · 1 line
1.7.5.4
Mark Brown
AppliedQuoted 2 lines · Liam Girdwood
Changes since V1:-
o Remove the unused "change" flag parameter fromsnd_soc_dapm_mux_update_power().
Applied, but I had to hand edit the changelog to remove this - it's supposed to come after the --- so this happens automatically.