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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
0682c592 af9a1da6

+9 -18
+9 -18
sound/soc/codecs/madera.c
··· 541 541 int madera_out1_demux_put(struct snd_kcontrol *kcontrol, 542 542 struct snd_ctl_elem_value *ucontrol) 543 543 { 544 - struct snd_soc_component *component = 545 - snd_soc_dapm_kcontrol_component(kcontrol); 546 - struct snd_soc_dapm_context *dapm = 547 - snd_soc_dapm_kcontrol_dapm(kcontrol); 544 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 545 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 548 546 struct madera_priv *priv = snd_soc_component_get_drvdata(component); 549 547 struct madera *madera = priv->madera; 550 548 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; ··· 630 632 int madera_out1_demux_get(struct snd_kcontrol *kcontrol, 631 633 struct snd_ctl_elem_value *ucontrol) 632 634 { 633 - struct snd_soc_component *component = 634 - snd_soc_dapm_kcontrol_component(kcontrol); 635 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 635 636 unsigned int val; 636 637 637 638 val = snd_soc_component_read(component, MADERA_OUTPUT_ENABLES_1); ··· 645 648 static int madera_inmux_put(struct snd_kcontrol *kcontrol, 646 649 struct snd_ctl_elem_value *ucontrol) 647 650 { 648 - struct snd_soc_component *component = 649 - snd_soc_dapm_kcontrol_component(kcontrol); 650 - struct snd_soc_dapm_context *dapm = 651 - snd_soc_dapm_kcontrol_dapm(kcontrol); 651 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 652 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 652 653 struct madera_priv *priv = snd_soc_component_get_drvdata(component); 653 654 struct madera *madera = priv->madera; 654 655 struct regmap *regmap = madera->regmap; ··· 1206 1211 const struct snd_soc_dapm_route *routes, 1207 1212 int n_mono_routes, int n_real) 1208 1213 { 1209 - struct snd_soc_dapm_context *dapm = 1210 - snd_soc_component_get_dapm(component); 1214 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 1211 1215 struct madera_priv *priv = snd_soc_component_get_drvdata(component); 1212 1216 struct madera *madera = priv->madera; 1213 1217 const struct madera_codec_pdata *pdata = &madera->pdata.codec; ··· 2155 2161 struct snd_ctl_elem_value *ucontrol) 2156 2162 { 2157 2163 struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 2158 - struct snd_soc_dapm_context *dapm = 2159 - snd_soc_component_get_dapm(component); 2164 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2160 2165 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 2161 2166 unsigned int reg = e->reg; 2162 2167 unsigned int val; ··· 2186 2193 struct soc_mixer_control *mc = 2187 2194 (struct soc_mixer_control *)kcontrol->private_value; 2188 2195 struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 2189 - struct snd_soc_dapm_context *dapm = 2190 - snd_soc_component_get_dapm(component); 2196 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 2191 2197 unsigned int val, mask; 2192 2198 int ret; 2193 2199 ··· 3228 3236 int clk_id, unsigned int freq, int dir) 3229 3237 { 3230 3238 struct snd_soc_component *component = dai->component; 3231 - struct snd_soc_dapm_context *dapm = 3232 - snd_soc_component_get_dapm(component); 3239 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 3233 3240 struct madera_priv *priv = snd_soc_component_get_drvdata(component); 3234 3241 struct madera_dai_priv *dai_priv = &priv->dai[dai->id - 1]; 3235 3242 struct snd_soc_dapm_route routes[2];