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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
5d9958b2 636819c3

+25 -34
+25 -34
sound/soc/codecs/sma1307.c
··· 790 790 static int sma1307_dapm_aif_in_get(struct snd_kcontrol *kcontrol, 791 791 struct snd_ctl_elem_value *ucontrol) 792 792 { 793 - struct snd_soc_dapm_context *dapm = 794 - snd_soc_dapm_kcontrol_dapm(kcontrol); 795 - struct sma1307_priv *sma1307 = 796 - snd_soc_component_get_drvdata(dapm->component); 793 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 794 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 795 + struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component); 797 796 798 797 ucontrol->value.enumerated.item[0] = (unsigned int)sma1307->dapm_aif_in; 799 798 snd_soc_dapm_put_enum_double(kcontrol, ucontrol); ··· 803 804 static int sma1307_dapm_aif_in_put(struct snd_kcontrol *kcontrol, 804 805 struct snd_ctl_elem_value *ucontrol) 805 806 { 806 - struct snd_soc_dapm_context *dapm = 807 - snd_soc_dapm_kcontrol_dapm(kcontrol); 808 - struct sma1307_priv *sma1307 = 809 - snd_soc_component_get_drvdata(dapm->component); 807 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 808 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 809 + struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component); 810 810 int val = (int)ucontrol->value.enumerated.item[0]; 811 811 bool change; 812 812 ··· 828 830 static int sma1307_dapm_sdo_setting_get(struct snd_kcontrol *kcontrol, 829 831 struct snd_ctl_elem_value *ucontrol) 830 832 { 831 - struct snd_soc_dapm_context *dapm = 832 - snd_soc_dapm_kcontrol_dapm(kcontrol); 833 - struct sma1307_priv *sma1307 = 834 - snd_soc_component_get_drvdata(dapm->component); 833 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 834 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 835 + struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component); 835 836 836 837 ucontrol->value.enumerated.item[0] = 837 838 (unsigned int)sma1307->dapm_sdo_setting; ··· 842 845 static int sma1307_dapm_sdo_setting_put(struct snd_kcontrol *kcontrol, 843 846 struct snd_ctl_elem_value *ucontrol) 844 847 { 845 - struct snd_soc_dapm_context *dapm = 846 - snd_soc_dapm_kcontrol_dapm(kcontrol); 847 - struct sma1307_priv *sma1307 = 848 - snd_soc_component_get_drvdata(dapm->component); 848 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 849 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 850 + struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component); 849 851 int val = (int)ucontrol->value.enumerated.item[0]; 850 852 bool change; 851 853 ··· 867 871 static int sma1307_dapm_aif_out_get(struct snd_kcontrol *kcontrol, 868 872 struct snd_ctl_elem_value *ucontrol) 869 873 { 870 - struct snd_soc_dapm_context *dapm = 871 - snd_soc_dapm_kcontrol_dapm(kcontrol); 872 - struct sma1307_priv *sma1307 = 873 - snd_soc_component_get_drvdata(dapm->component); 874 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 875 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 876 + struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component); 874 877 unsigned int val = 0; 875 878 876 879 if (!strcmp(kcontrol->id.name, SMA1307_AIF_OUT0_NAME)) { ··· 890 895 static int sma1307_dapm_aif_out_put(struct snd_kcontrol *kcontrol, 891 896 struct snd_ctl_elem_value *ucontrol) 892 897 { 893 - struct snd_soc_dapm_context *dapm = 894 - snd_soc_dapm_kcontrol_dapm(kcontrol); 895 - struct sma1307_priv *sma1307 = 896 - snd_soc_component_get_drvdata(dapm->component); 898 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 899 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 900 + struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component); 897 901 int val = (int)ucontrol->value.enumerated.item[0]; 898 902 bool change; 899 903 ··· 927 933 static int sma1307_dapm_sdo_enable_get(struct snd_kcontrol *kcontrol, 928 934 struct snd_ctl_elem_value *ucontrol) 929 935 { 930 - struct snd_soc_dapm_context *dapm = 931 - snd_soc_dapm_kcontrol_dapm(kcontrol); 932 - struct sma1307_priv *sma1307 = 933 - snd_soc_component_get_drvdata(dapm->component); 936 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 937 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 938 + struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component); 934 939 935 940 ucontrol->value.integer.value[0] = (long)sma1307->dapm_sdo_en; 936 941 snd_soc_dapm_put_volsw(kcontrol, ucontrol); ··· 940 947 static int sma1307_dapm_sdo_enable_put(struct snd_kcontrol *kcontrol, 941 948 struct snd_ctl_elem_value *ucontrol) 942 949 { 943 - struct snd_soc_dapm_context *dapm = 944 - snd_soc_dapm_kcontrol_dapm(kcontrol); 945 - struct sma1307_priv *sma1307 = 946 - snd_soc_component_get_drvdata(dapm->component); 950 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 951 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 952 + struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component); 947 953 int val = (int)ucontrol->value.integer.value[0]; 948 954 bool change; 949 955 ··· 1849 1857 1850 1858 static int sma1307_probe(struct snd_soc_component *component) 1851 1859 { 1852 - struct snd_soc_dapm_context *dapm = 1853 - snd_soc_component_get_dapm(component); 1860 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1854 1861 1855 1862 snd_soc_dapm_sync(dapm); 1856 1863