Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: codecs: max9867: 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/87v7jh4dtf.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
46fb094b a7ab96cf

+8 -3
+8 -3
sound/soc/codecs/max9867.c
··· 556 556 #ifdef CONFIG_PM 557 557 static int max9867_suspend(struct snd_soc_component *component) 558 558 { 559 - snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF); 559 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 560 + 561 + snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF); 560 562 561 563 return 0; 562 564 } 563 565 564 566 static int max9867_resume(struct snd_soc_component *component) 565 567 { 566 - snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY); 568 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 569 + 570 + snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY); 567 571 568 572 return 0; 569 573 } ··· 581 577 { 582 578 int err; 583 579 struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); 580 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); 584 581 585 582 switch (level) { 586 583 case SND_SOC_BIAS_ON: ··· 590 585 return err; 591 586 break; 592 587 case SND_SOC_BIAS_STANDBY: 593 - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { 588 + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) { 594 589 err = regcache_sync(max9867->regmap); 595 590 if (err) 596 591 return err;