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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
bccf1a2e 4bac87b4

+8 -6
+8 -6
sound/soc/codecs/cs35l56.c
··· 896 896 897 897 static struct snd_soc_dapm_context *cs35l56_power_up_for_cal(struct cs35l56_private *cs35l56) 898 898 { 899 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cs35l56->component); 899 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cs35l56->component); 900 900 int ret; 901 901 902 - ret = snd_soc_component_enable_pin(cs35l56->component, "Calibrate"); 902 + ret = snd_soc_dapm_enable_pin(dapm, "Calibrate"); 903 903 if (ret) 904 904 return ERR_PTR(ret); 905 905 ··· 910 910 911 911 static void cs35l56_power_down_after_cal(struct cs35l56_private *cs35l56) 912 912 { 913 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cs35l56->component); 913 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cs35l56->component); 914 914 915 - snd_soc_component_disable_pin(cs35l56->component, "Calibrate"); 915 + snd_soc_dapm_disable_pin(dapm, "Calibrate"); 916 916 snd_soc_dapm_sync(dapm); 917 917 } 918 918 ··· 1131 1131 1132 1132 static int cs35l56_component_probe(struct snd_soc_component *component) 1133 1133 { 1134 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1134 1135 struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component); 1135 1136 struct dentry *debugfs_root = component->debugfs_root; 1136 1137 unsigned short vendor, device; ··· 1205 1204 if (ret) 1206 1205 return dev_err_probe(cs35l56->base.dev, ret, "unable to add controls\n"); 1207 1206 1208 - ret = snd_soc_component_disable_pin(component, "Calibrate"); 1207 + ret = snd_soc_dapm_disable_pin(dapm, "Calibrate"); 1209 1208 if (ret) 1210 1209 return ret; 1211 1210 ··· 1243 1242 enum snd_soc_bias_level level) 1244 1243 { 1245 1244 struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component); 1245 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1246 1246 1247 1247 switch (level) { 1248 1248 case SND_SOC_BIAS_STANDBY: ··· 1251 1249 * Wait for patching to complete when transitioning from 1252 1250 * BIAS_OFF to BIAS_STANDBY 1253 1251 */ 1254 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) 1252 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) 1255 1253 cs35l56_wait_dsp_ready(cs35l56); 1256 1254 1257 1255 break;