mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 04:04:43 +01:00
ASoC: codecs: arizona-jack: 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/87cy5p8lqk.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
797e4164fe
commit
335f0d947f
1 changed files with 3 additions and 5 deletions
|
|
@ -212,17 +212,16 @@ static void arizona_extcon_pulse_micbias(struct arizona_priv *info)
|
|||
struct arizona *arizona = info->arizona;
|
||||
const char *widget = arizona_extcon_get_micbias(info);
|
||||
struct snd_soc_dapm_context *dapm = arizona->dapm;
|
||||
struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
|
||||
int ret;
|
||||
|
||||
ret = snd_soc_component_force_enable_pin(component, widget);
|
||||
ret = snd_soc_dapm_force_enable_pin(dapm, widget);
|
||||
if (ret)
|
||||
dev_warn(arizona->dev, "Failed to enable %s: %d\n", widget, ret);
|
||||
|
||||
snd_soc_dapm_sync(dapm);
|
||||
|
||||
if (!arizona->pdata.micd_force_micbias) {
|
||||
ret = snd_soc_component_disable_pin(component, widget);
|
||||
ret = snd_soc_dapm_disable_pin(dapm, widget);
|
||||
if (ret)
|
||||
dev_warn(arizona->dev, "Failed to disable %s: %d\n", widget, ret);
|
||||
|
||||
|
|
@ -287,7 +286,6 @@ static void arizona_stop_mic(struct arizona_priv *info)
|
|||
struct arizona *arizona = info->arizona;
|
||||
const char *widget = arizona_extcon_get_micbias(info);
|
||||
struct snd_soc_dapm_context *dapm = arizona->dapm;
|
||||
struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
|
||||
bool change = false;
|
||||
int ret;
|
||||
|
||||
|
|
@ -297,7 +295,7 @@ static void arizona_stop_mic(struct arizona_priv *info)
|
|||
if (ret < 0)
|
||||
dev_err(arizona->dev, "Failed to disable micd: %d\n", ret);
|
||||
|
||||
ret = snd_soc_component_disable_pin(component, widget);
|
||||
ret = snd_soc_dapm_disable_pin(dapm, widget);
|
||||
if (ret)
|
||||
dev_warn(arizona->dev, "Failed to disable %s: %d\n", widget, ret);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue