Unverified Commit 0682c592 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/877bvx5seo.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent af9a1da6

sound/soc/codecs/madera.c

+9 −18
Original line number Diff line number Diff line
@@ -541,10 +541,8 @@ EXPORT_SYMBOL_GPL(madera_domain_clk_ev); 
int madera_out1_demux_put(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_component *component =

		snd_soc_dapm_kcontrol_component(kcontrol);

	struct snd_soc_dapm_context *dapm =

		snd_soc_dapm_kcontrol_dapm(kcontrol);

	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);

	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);

	struct madera_priv *priv = snd_soc_component_get_drvdata(component);

	struct madera *madera = priv->madera;

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
@@ -632,8 +630,7 @@ EXPORT_SYMBOL_GPL(madera_out1_demux_put); 
int madera_out1_demux_get(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_component *component =

		snd_soc_dapm_kcontrol_component(kcontrol);

	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);

	unsigned int val;



	val = snd_soc_component_read(component, MADERA_OUTPUT_ENABLES_1);
@@ -648,10 +645,8 @@ EXPORT_SYMBOL_GPL(madera_out1_demux_get); 
static int madera_inmux_put(struct snd_kcontrol *kcontrol,

			    struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_component *component =

		snd_soc_dapm_kcontrol_component(kcontrol);

	struct snd_soc_dapm_context *dapm =

		snd_soc_dapm_kcontrol_dapm(kcontrol);

	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);

	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);

	struct madera_priv *priv = snd_soc_component_get_drvdata(component);

	struct madera *madera = priv->madera;

	struct regmap *regmap = madera->regmap;
@@ -1211,8 +1206,7 @@ int madera_init_outputs(struct snd_soc_component *component, 
			const struct snd_soc_dapm_route *routes,

			int n_mono_routes, int n_real)

{

	struct snd_soc_dapm_context *dapm =

		snd_soc_component_get_dapm(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

	struct madera_priv *priv = snd_soc_component_get_drvdata(component);

	struct madera *madera = priv->madera;

	const struct madera_codec_pdata *pdata = &madera->pdata.codec;
@@ -2161,8 +2155,7 @@ int madera_dfc_put(struct snd_kcontrol *kcontrol, 
		   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);

	struct snd_soc_dapm_context *dapm =

		snd_soc_component_get_dapm(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int reg = e->reg;

	unsigned int val;
@@ -2193,8 +2186,7 @@ int madera_lp_mode_put(struct snd_kcontrol *kcontrol, 
	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);

	struct snd_soc_dapm_context *dapm =

		snd_soc_component_get_dapm(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

	unsigned int val, mask;

	int ret;
@@ -3236,8 +3228,7 @@ static int madera_dai_set_sysclk(struct snd_soc_dai *dai, 
				 int clk_id, unsigned int freq, int dir)

{

	struct snd_soc_component *component = dai->component;

	struct snd_soc_dapm_context *dapm =

		snd_soc_component_get_dapm(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

	struct madera_priv *priv = snd_soc_component_get_drvdata(component);

	struct madera_dai_priv *dai_priv = &priv->dai[dai->id - 1];

	struct snd_soc_dapm_route routes[2];