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

ASoC: samsung: tm2_wm5110: 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/875xbhv22y.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
b6ba1a11 d1cca4a4

+4 -3
+4 -3
sound/soc/samsung/tm2_wm5110.c
··· 260 260 static int tm2_mic_bias(struct snd_soc_dapm_widget *w, 261 261 struct snd_kcontrol *kcontrol, int event) 262 262 { 263 - struct snd_soc_card *card = w->dapm->card; 263 + struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm); 264 264 struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(card); 265 265 266 266 switch (event) { ··· 279 279 struct snd_soc_dapm_context *dapm, 280 280 enum snd_soc_bias_level level) 281 281 { 282 + struct snd_soc_dapm_context *card_dapm = snd_soc_card_to_dapm(card); 282 283 struct snd_soc_pcm_runtime *rtd; 283 284 284 285 rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); 285 286 286 - if (dapm->dev != snd_soc_rtd_to_codec(rtd, 0)->dev) 287 + if (snd_soc_dapm_to_dev(dapm) != snd_soc_rtd_to_codec(rtd, 0)->dev) 287 288 return 0; 288 289 289 290 switch (level) { 290 291 case SND_SOC_BIAS_STANDBY: 291 - if (card->dapm.bias_level == SND_SOC_BIAS_OFF) 292 + if (snd_soc_dapm_get_bias_level(card_dapm) == SND_SOC_BIAS_OFF) 292 293 tm2_start_sysclk(card); 293 294 break; 294 295 case SND_SOC_BIAS_OFF: