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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
7fdcd1d1 97062ef8

+6 -6
+6 -6
sound/soc/codecs/cs530x.c
··· 131 131 struct snd_ctl_elem_value *ucontrol) 132 132 { 133 133 struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 134 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 134 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 135 135 struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component); 136 136 struct regmap *regmap = cs530x->regmap; 137 137 int ret; ··· 522 522 523 523 static void cs530x_add_12_adc_widgets(struct snd_soc_component *component) 524 524 { 525 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 525 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 526 526 527 527 snd_soc_add_component_controls(component, 528 528 cs530x_in_1_to_2_controls, ··· 537 537 538 538 static void cs530x_add_34_adc_widgets(struct snd_soc_component *component) 539 539 { 540 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 540 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 541 541 542 542 snd_soc_add_component_controls(component, 543 543 cs530x_in_3_to_4_controls, ··· 669 669 670 670 static void cs530x_add_12_dac_widgets(struct snd_soc_component *component) 671 671 { 672 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 672 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 673 673 674 674 snd_soc_add_component_controls(component, 675 675 cs530x_out_1_to_2_controls, ··· 684 684 685 685 static void cs530x_add_34_dac_widgets(struct snd_soc_component *component) 686 686 { 687 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 687 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 688 688 689 689 snd_soc_add_component_controls(component, 690 690 cs530x_out_3_to_4_controls, ··· 1007 1007 static int cs530x_component_probe(struct snd_soc_component *component) 1008 1008 { 1009 1009 struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component); 1010 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); 1010 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1011 1011 int num_widgets; 1012 1012 1013 1013 snd_soc_dapm_new_controls(dapm, cs530x_gen_dapm_widgets,