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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
4db61b8c 75dc6bf1

+3 -2
+3 -2
sound/soc/codecs/cs47l15.c
··· 1278 1278 1279 1279 static int cs47l15_component_probe(struct snd_soc_component *component) 1280 1280 { 1281 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1281 1282 struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); 1282 1283 struct madera *madera = cs47l15->core.madera; 1283 1284 int ret; ··· 1286 1285 snd_soc_component_init_regmap(component, madera->regmap); 1287 1286 1288 1287 mutex_lock(&madera->dapm_ptr_lock); 1289 - madera->dapm = snd_soc_component_get_dapm(component); 1288 + madera->dapm = snd_soc_component_to_dapm(component); 1290 1289 mutex_unlock(&madera->dapm_ptr_lock); 1291 1290 1292 1291 ret = madera_init_inputs(component); ··· 1299 1298 if (ret) 1300 1299 return ret; 1301 1300 1302 - snd_soc_component_disable_pin(component, "HAPTICS"); 1301 + snd_soc_dapm_disable_pin(dapm, "HAPTICS"); 1303 1302 1304 1303 ret = snd_soc_add_component_controls(component, 1305 1304 madera_adsp_rate_controls,