Unverified Commit 6ef8e2f7 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: codecs: max98090: 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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/874ir15seh.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9c3c02de

sound/soc/codecs/max98090.c

+4 −3
Original line number Diff line number Diff line
@@ -1469,7 +1469,7 @@ static const struct snd_soc_dapm_route max98091_dapm_routes[] = { 
static int max98090_add_widgets(struct snd_soc_component *component)

{

	struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);



	snd_soc_add_component_controls(component, max98090_snd_controls,

		ARRAY_SIZE(max98090_snd_controls));
@@ -1751,6 +1751,7 @@ static int max98090_set_bias_level(struct snd_soc_component *component, 
				   enum snd_soc_bias_level level)

{

	struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

	int ret;



	switch (level) {
@@ -1768,7 +1769,7 @@ static int max98090_set_bias_level(struct snd_soc_component *component, 
		if (IS_ERR(max98090->mclk))

			break;



		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {

		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) {

			clk_disable_unprepare(max98090->mclk);

		} else {

			ret = clk_prepare_enable(max98090->mclk);
@@ -1778,7 +1779,7 @@ static int max98090_set_bias_level(struct snd_soc_component *component, 
		break;



	case SND_SOC_BIAS_STANDBY:

		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {

		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {

			ret = regcache_sync(max98090->regmap);

			if (ret != 0) {

				dev_err(component->dev,