mirror of https://github.com/torvalds/linux.git
ASoC: codecs: wm8998: 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/87seelxvfr.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
1a8870e2e2
commit
8a19eabf16
|
|
@ -101,8 +101,8 @@ static int wm8998_asrc_ev(struct snd_soc_dapm_widget *w,
|
||||||
static int wm8998_inmux_put(struct snd_kcontrol *kcontrol,
|
static int wm8998_inmux_put(struct snd_kcontrol *kcontrol,
|
||||||
struct snd_ctl_elem_value *ucontrol)
|
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);
|
||||||
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 wm8998_priv *wm8998 = snd_soc_component_get_drvdata(component);
|
struct wm8998_priv *wm8998 = snd_soc_component_get_drvdata(component);
|
||||||
struct arizona *arizona = wm8998->core.arizona;
|
struct arizona *arizona = wm8998->core.arizona;
|
||||||
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
|
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
|
||||||
|
|
@ -1279,7 +1279,7 @@ static int wm8998_set_fll(struct snd_soc_component *component, int fll_id,
|
||||||
static int wm8998_component_probe(struct snd_soc_component *component)
|
static int wm8998_component_probe(struct snd_soc_component *component)
|
||||||
{
|
{
|
||||||
struct wm8998_priv *priv = snd_soc_component_get_drvdata(component);
|
struct wm8998_priv *priv = snd_soc_component_get_drvdata(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 arizona *arizona = priv->core.arizona;
|
struct arizona *arizona = priv->core.arizona;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
@ -1292,7 +1292,7 @@ static int wm8998_component_probe(struct snd_soc_component *component)
|
||||||
|
|
||||||
arizona_init_gpio(component);
|
arizona_init_gpio(component);
|
||||||
|
|
||||||
snd_soc_component_disable_pin(component, "HAPTICS");
|
snd_soc_dapm_disable_pin(dapm, "HAPTICS");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue