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

ASoC: mediatek: mtk-afe-platform-driver: 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/87a50twgq3.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
063e91a9 5a3c54a9

+4 -3
+4 -3
sound/soc/mediatek/common/mtk-afe-platform-driver.c
··· 48 48 49 49 int mtk_afe_add_sub_dai_control(struct snd_soc_component *component) 50 50 { 51 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 51 52 struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); 52 53 struct mtk_base_afe_dai *dai; 53 54 ··· 59 58 dai->num_controls); 60 59 61 60 if (dai->dapm_widgets) 62 - snd_soc_dapm_new_controls(&component->dapm, 61 + snd_soc_dapm_new_controls(dapm, 63 62 dai->dapm_widgets, 64 63 dai->num_dapm_widgets); 65 64 } 66 65 /* add routes after all widgets are added */ 67 66 list_for_each_entry(dai, &afe->sub_dais, list) { 68 67 if (dai->dapm_routes) 69 - snd_soc_dapm_add_routes(&component->dapm, 68 + snd_soc_dapm_add_routes(dapm, 70 69 dai->dapm_routes, 71 70 dai->num_dapm_routes); 72 71 } 73 72 74 - snd_soc_dapm_new_widgets(component->dapm.card); 73 + snd_soc_dapm_new_widgets(component->card); 75 74 76 75 return 0; 77 76