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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
1ddafb83 eeb152d9

+8 -6
+8 -6
sound/soc/codecs/tlv320aic31xx.c
··· 799 799 800 800 static int aic31xx_add_widgets(struct snd_soc_component *component) 801 801 { 802 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 802 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 803 803 struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component); 804 804 int ret = 0; 805 805 ··· 1030 1030 static int aic31xx_clock_master_routes(struct snd_soc_component *component, 1031 1031 unsigned int fmt) 1032 1032 { 1033 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1033 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1034 1034 struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component); 1035 1035 int ret; 1036 1036 ··· 1316 1316 static int aic31xx_set_bias_level(struct snd_soc_component *component, 1317 1317 enum snd_soc_bias_level level) 1318 1318 { 1319 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1320 + 1319 1321 dev_dbg(component->dev, "## %s: %d -> %d\n", __func__, 1320 - snd_soc_component_get_bias_level(component), level); 1322 + snd_soc_dapm_get_bias_level(dapm), level); 1321 1323 1322 1324 switch (level) { 1323 1325 case SND_SOC_BIAS_ON: 1324 1326 break; 1325 1327 case SND_SOC_BIAS_PREPARE: 1326 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) 1328 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) 1327 1329 aic31xx_clk_on(component); 1328 1330 break; 1329 1331 case SND_SOC_BIAS_STANDBY: 1330 - switch (snd_soc_component_get_bias_level(component)) { 1332 + switch (snd_soc_dapm_get_bias_level(dapm)) { 1331 1333 case SND_SOC_BIAS_OFF: 1332 1334 aic31xx_power_on(component); 1333 1335 break; ··· 1341 1339 } 1342 1340 break; 1343 1341 case SND_SOC_BIAS_OFF: 1344 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) 1342 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) 1345 1343 aic31xx_power_off(component); 1346 1344 break; 1347 1345 }