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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
2049f715 d6abe1e3

+5 -6
+5 -6
sound/soc/codecs/rt5659.c
··· 1213 1213 static void rt5659_enable_push_button_irq(struct snd_soc_component *component, 1214 1214 bool enable) 1215 1215 { 1216 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1216 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1217 1217 1218 1218 if (enable) { 1219 1219 snd_soc_component_write(component, RT5659_4BTN_IL_CMD_1, 0x000b); ··· 1257 1257 1258 1258 static int rt5659_headset_detect(struct snd_soc_component *component, int jack_insert) 1259 1259 { 1260 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1260 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1261 1261 int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30}; 1262 1262 int reg_63; 1263 1263 ··· 3611 3611 static int rt5659_set_bias_level(struct snd_soc_component *component, 3612 3612 enum snd_soc_bias_level level) 3613 3613 { 3614 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 3614 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 3615 3615 struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); 3616 3616 int ret; 3617 3617 ··· 3631 3631 break; 3632 3632 3633 3633 case SND_SOC_BIAS_STANDBY: 3634 - if (dapm->bias_level == SND_SOC_BIAS_OFF) { 3634 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 3635 3635 ret = clk_prepare_enable(rt5659->mclk); 3636 3636 if (ret) { 3637 3637 dev_err(component->dev, ··· 3662 3662 3663 3663 static int rt5659_probe(struct snd_soc_component *component) 3664 3664 { 3665 - struct snd_soc_dapm_context *dapm = 3666 - snd_soc_component_get_dapm(component); 3665 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 3667 3666 struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); 3668 3667 3669 3668 rt5659->component = component;