Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: audio_helper: convert to snd_soc_dapm_xxx()

This patch converts below functions.

dapm->dev -> snd_soc_dapm_to_dev()
dapm->card -> snd_soc_dapm_to_card()
dapm->component -> snd_soc_dapm_to_component()

dapm_kcontrol_get_value() -> snd_soc_dapm_kcontrol_get_value()

snd_soc_component_enable_pin() -> snd_soc_dapm_enable_pin()
snd_soc_component_enable_pin_unlocked() -> snd_soc_dapm_enable_pin_unlocked()
snd_soc_component_disable_pin() -> snd_soc_dapm_disable_pin()
snd_soc_component_disable_pin_unlocked() -> snd_soc_dapm_disable_pin_unlocked()
snd_soc_component_nc_pin() -> snd_soc_dapm_nc_pin()
snd_soc_component_nc_pin_unlocked() -> snd_soc_dapm_nc_pin_unlocked()
snd_soc_component_get_pin_status() -> snd_soc_dapm_get_pin_status()
snd_soc_component_force_enable_pin() -> snd_soc_dapm_force_enable_pin()
snd_soc_component_force_enable_pin_unlocked() -> snd_soc_dapm_force_enable_pin_unlocked()
snd_soc_component_force_bias_level() -> snd_soc_dapm_force_bias_level()
snd_soc_component_get_bias_level() -> snd_soc_dapm_get_bias_level()
snd_soc_component_init_bias_level() -> snd_soc_dapm_init_bias_level()
snd_soc_component_get_dapm() -> snd_soc_component_to_dapm()

snd_soc_dapm_kcontrol_component() -> snd_soc_dapm_kcontrol_to_component()
snd_soc_dapm_kcontrol_widget() -> snd_soc_dapm_kcontrol_to_widget()
snd_soc_dapm_kcontrol_dapm() -> snd_soc_dapm_kcontrol_to_dapm()
snd_soc_dapm_np_pin() -> snd_soc_dapm_disable_pin()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/877bvxa0d6.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
ed71deee 64f90b32

+5 -4
+5 -4
drivers/staging/greybus/audio_helper.c
··· 115 115 { 116 116 int i; 117 117 struct snd_soc_dapm_widget *w, *tmp_w; 118 + struct snd_soc_card *card = snd_soc_dapm_to_card(dapm); 118 119 119 - mutex_lock(&dapm->card->dapm_mutex); 120 + mutex_lock(&card->dapm_mutex); 120 121 for (i = 0; i < num; i++) { 121 122 /* below logic can be optimized to identify widget pointer */ 122 123 w = NULL; 123 - list_for_each_entry(tmp_w, &dapm->card->widgets, list) { 124 + list_for_each_entry(tmp_w, &card->widgets, list) { 124 125 if (tmp_w->dapm == dapm && 125 126 !strcmp(tmp_w->name, widget->name)) { 126 127 w = tmp_w; ··· 129 128 } 130 129 } 131 130 if (!w) { 132 - dev_err(dapm->dev, "%s: widget not found\n", 131 + dev_err(card->dev, "%s: widget not found\n", 133 132 widget->name); 134 133 widget++; 135 134 continue; ··· 137 136 widget++; 138 137 gbaudio_dapm_free_widget(w); 139 138 } 140 - mutex_unlock(&dapm->card->dapm_mutex); 139 + mutex_unlock(&card->dapm_mutex); 141 140 return 0; 142 141 } 143 142