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

ASoC: mediatek: mt8188-mt6359: 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/874ir1wgpo.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
af535c76 771f522d

+10 -7
+10 -7
sound/soc/mediatek/mt8188/mt8188-mt6359.c
··· 684 684 static int mt8188_dumb_amp_init(struct snd_soc_pcm_runtime *rtd) 685 685 { 686 686 struct snd_soc_card *card = rtd->card; 687 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 687 688 int ret = 0; 688 689 689 - ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_dumb_spk_widgets, 690 + ret = snd_soc_dapm_new_controls(dapm, mt8188_dumb_spk_widgets, 690 691 ARRAY_SIZE(mt8188_dumb_spk_widgets)); 691 692 if (ret) { 692 693 dev_err(rtd->dev, "unable to add Dumb Speaker dapm, ret %d\n", ret); ··· 738 737 static int mt8188_max98390_codec_init(struct snd_soc_pcm_runtime *rtd) 739 738 { 740 739 struct snd_soc_card *card = rtd->card; 740 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 741 741 int ret; 742 742 743 743 /* add regular speakers dapm route */ 744 - ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_dual_spk_widgets, 744 + ret = snd_soc_dapm_new_controls(dapm, mt8188_dual_spk_widgets, 745 745 ARRAY_SIZE(mt8188_dual_spk_widgets)); 746 746 if (ret) { 747 747 dev_err(rtd->dev, "unable to add Left/Right Speaker widget, ret %d\n", ret); ··· 760 758 return 0; 761 759 762 760 /* add widgets/controls/dapm for rear speakers */ 763 - ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_rear_spk_widgets, 761 + ret = snd_soc_dapm_new_controls(dapm, mt8188_rear_spk_widgets, 764 762 ARRAY_SIZE(mt8188_rear_spk_widgets)); 765 763 if (ret) { 766 764 dev_err(rtd->dev, "unable to add Rear Speaker widget, ret %d\n", ret); ··· 781 779 static int mt8188_headset_codec_init(struct snd_soc_pcm_runtime *rtd) 782 780 { 783 781 struct snd_soc_card *card = rtd->card; 782 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 784 783 struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); 785 784 struct snd_soc_jack *jack = &soc_card_data->card_data->jacks[MT8188_JACK_HEADSET]; 786 785 struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; 787 786 struct mtk_platform_card_data *card_data = soc_card_data->card_data; 788 787 int ret; 789 788 790 - ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_nau8825_widgets, 789 + ret = snd_soc_dapm_new_controls(dapm, mt8188_nau8825_widgets, 791 790 ARRAY_SIZE(mt8188_nau8825_widgets)); 792 791 if (ret) { 793 792 dev_err(rtd->dev, "unable to add nau8825 card widget, ret %d\n", ret); ··· 818 815 snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); 819 816 snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); 820 817 snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); 821 - snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); 818 + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); 822 819 } else { 823 820 snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); 824 821 snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); 825 822 snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); 826 - snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); 823 + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); 827 824 } 828 - 825 + 829 826 ret = snd_soc_component_set_jack(component, jack, NULL); 830 827 831 828 if (ret) {