mirror of https://github.com/torvalds/linux.git
ASoC: codecs: cs35l45: 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/87zf8t773q.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
f0962b1a35
commit
4bac87b474
|
|
@ -214,7 +214,7 @@ static int cs35l45_amplifier_mode_put(struct snd_kcontrol *kcontrol,
|
||||||
struct cs35l45_private *cs35l45 =
|
struct cs35l45_private *cs35l45 =
|
||||||
snd_soc_component_get_drvdata(component);
|
snd_soc_component_get_drvdata(component);
|
||||||
struct snd_soc_dapm_context *dapm =
|
struct snd_soc_dapm_context *dapm =
|
||||||
snd_soc_component_get_dapm(component);
|
snd_soc_component_to_dapm(component);
|
||||||
unsigned int amp_state;
|
unsigned int amp_state;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
@ -233,7 +233,7 @@ static int cs35l45_amplifier_mode_put(struct snd_kcontrol *kcontrol,
|
||||||
|
|
||||||
regmap_clear_bits(cs35l45->regmap, CS35L45_BLOCK_ENABLES,
|
regmap_clear_bits(cs35l45->regmap, CS35L45_BLOCK_ENABLES,
|
||||||
CS35L45_AMP_EN_MASK);
|
CS35L45_AMP_EN_MASK);
|
||||||
snd_soc_component_disable_pin_unlocked(component, "SPK");
|
snd_soc_dapm_disable_pin_unlocked(dapm, "SPK");
|
||||||
snd_soc_dapm_sync_unlocked(dapm);
|
snd_soc_dapm_sync_unlocked(dapm);
|
||||||
|
|
||||||
if (ucontrol->value.integer.value[0] == AMP_MODE_SPK) {
|
if (ucontrol->value.integer.value[0] == AMP_MODE_SPK) {
|
||||||
|
|
@ -287,7 +287,7 @@ static int cs35l45_amplifier_mode_put(struct snd_kcontrol *kcontrol,
|
||||||
regmap_set_bits(cs35l45->regmap, CS35L45_BLOCK_ENABLES,
|
regmap_set_bits(cs35l45->regmap, CS35L45_BLOCK_ENABLES,
|
||||||
CS35L45_AMP_EN_MASK);
|
CS35L45_AMP_EN_MASK);
|
||||||
|
|
||||||
snd_soc_component_enable_pin_unlocked(component, "SPK");
|
snd_soc_dapm_enable_pin_unlocked(dapm, "SPK");
|
||||||
snd_soc_dapm_sync_unlocked(dapm);
|
snd_soc_dapm_sync_unlocked(dapm);
|
||||||
snd_soc_dapm_mutex_unlock(dapm);
|
snd_soc_dapm_mutex_unlock(dapm);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue