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

ASoC: sdw_utils: soc_sdw_maxim: 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/87tsz1tnhq.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
f39ee578 fbada860

+4 -4
+4 -4
sound/soc/sdw_utils/soc_sdw_maxim.c
··· 26 26 int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) 27 27 { 28 28 struct snd_soc_card *card = rtd->card; 29 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 29 30 int ret; 30 31 31 - ret = snd_soc_dapm_add_routes(&card->dapm, max_98373_dapm_routes, 2); 32 + ret = snd_soc_dapm_add_routes(dapm, max_98373_dapm_routes, 2); 32 33 if (ret) 33 34 dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret); 34 35 ··· 51 50 52 51 cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 53 52 for_each_rtd_codec_dais(rtd, j, codec_dai) { 54 - struct snd_soc_dapm_context *dapm = 55 - snd_soc_component_get_dapm(cpu_dai->component); 53 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cpu_dai->component); 56 54 char pin_name[16]; 57 55 58 56 snprintf(pin_name, ARRAY_SIZE(pin_name), "%s Spk", ··· 104 104 105 105 static int asoc_sdw_mx8373_sdw_late_probe(struct snd_soc_card *card) 106 106 { 107 - struct snd_soc_dapm_context *dapm = &card->dapm; 107 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 108 108 109 109 /* Disable Left and Right Spk pin after boot */ 110 110 snd_soc_dapm_disable_pin(dapm, "Left Spk");