mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 00:53:34 +02:00
ASoC: amd: acp3x-es83xx: 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/87zf8t8ls8.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
6b1b50ed3c
commit
170bc7a0e2
|
|
@ -159,7 +159,8 @@ static int acp3x_es83xx_configure_widgets(struct snd_soc_card *card)
|
|||
static int acp3x_es83xx_headphone_power_event(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *kcontrol, int event)
|
||||
{
|
||||
struct acp3x_es83xx_private *priv = get_mach_priv(w->dapm->card);
|
||||
struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
|
||||
struct acp3x_es83xx_private *priv = get_mach_priv(card);
|
||||
|
||||
dev_dbg(priv->codec_dev, "headphone power event = %d\n", event);
|
||||
if (SND_SOC_DAPM_EVENT_ON(event))
|
||||
|
|
@ -176,7 +177,8 @@ static int acp3x_es83xx_headphone_power_event(struct snd_soc_dapm_widget *w,
|
|||
static int acp3x_es83xx_speaker_power_event(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *kcontrol, int event)
|
||||
{
|
||||
struct acp3x_es83xx_private *priv = get_mach_priv(w->dapm->card);
|
||||
struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
|
||||
struct acp3x_es83xx_private *priv = get_mach_priv(card);
|
||||
|
||||
dev_dbg(priv->codec_dev, "speaker power event: %d\n", event);
|
||||
if (SND_SOC_DAPM_EVENT_ON(event))
|
||||
|
|
@ -314,7 +316,9 @@ static int acp3x_es83xx_init(struct snd_soc_pcm_runtime *runtime)
|
|||
|
||||
num_routes = acp3x_es83xx_configure_mics(priv);
|
||||
if (num_routes > 0) {
|
||||
ret = snd_soc_dapm_add_routes(&card->dapm, priv->mic_map, num_routes);
|
||||
struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
|
||||
|
||||
ret = snd_soc_dapm_add_routes(dapm, priv->mic_map, num_routes);
|
||||
if (ret != 0)
|
||||
device_remove_software_node(priv->codec_dev);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user