mirror of https://github.com/torvalds/linux.git
ASoC: codecs: cs47l15: 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/87ldkd772p.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
75dc6bf1d4
commit
4db61b8cd5
|
|
@ -1278,6 +1278,7 @@ static const struct snd_soc_dapm_route cs47l15_mono_routes[] = {
|
||||||
|
|
||||||
static int cs47l15_component_probe(struct snd_soc_component *component)
|
static int cs47l15_component_probe(struct snd_soc_component *component)
|
||||||
{
|
{
|
||||||
|
struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
|
||||||
struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component);
|
struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component);
|
||||||
struct madera *madera = cs47l15->core.madera;
|
struct madera *madera = cs47l15->core.madera;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
@ -1285,7 +1286,7 @@ static int cs47l15_component_probe(struct snd_soc_component *component)
|
||||||
snd_soc_component_init_regmap(component, madera->regmap);
|
snd_soc_component_init_regmap(component, madera->regmap);
|
||||||
|
|
||||||
mutex_lock(&madera->dapm_ptr_lock);
|
mutex_lock(&madera->dapm_ptr_lock);
|
||||||
madera->dapm = snd_soc_component_get_dapm(component);
|
madera->dapm = snd_soc_component_to_dapm(component);
|
||||||
mutex_unlock(&madera->dapm_ptr_lock);
|
mutex_unlock(&madera->dapm_ptr_lock);
|
||||||
|
|
||||||
ret = madera_init_inputs(component);
|
ret = madera_init_inputs(component);
|
||||||
|
|
@ -1298,7 +1299,7 @@ static int cs47l15_component_probe(struct snd_soc_component *component)
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
snd_soc_component_disable_pin(component, "HAPTICS");
|
snd_soc_dapm_disable_pin(dapm, "HAPTICS");
|
||||||
|
|
||||||
ret = snd_soc_add_component_controls(component,
|
ret = snd_soc_add_component_controls(component,
|
||||||
madera_adsp_rate_controls,
|
madera_adsp_rate_controls,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue