Unverified Commit 7951b146 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: move snd_soc_component_set_bias_level() 



Current soc-dapm / soc-core are using a long way round to call
.set_bias_level.

	if (driver->set_bias_level)
		dapm->set_bias_level = ...;
	...
	if (dapm->set_bias_level)
		ret = dapm->set_bias_level(...);

We can directly call it via driver->set_bias_level.
One note here is that both Card and Component have dapm,
but, Card's dapm doesn't have dapm->component.
We need to check it.

This patch moves snd_soc_component_set_bias_level() to soc-component.c
and updates parameters.
dapm->set_bias_level is no longer needed

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87tvb94d0n.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -285,6 +285,8 @@ void snd_soc_component_seq_notifier(struct snd_soc_component *component, 
				    enum snd_soc_dapm_type type, int subseq);

int snd_soc_component_stream_event(struct snd_soc_component *component,

				   int event);

int snd_soc_component_set_bias_level(struct snd_soc_component *component,

				     enum snd_soc_bias_level level);



#ifdef CONFIG_REGMAP

void snd_soc_component_init_regmap(struct snd_soc_component *component,

include/sound/soc-dapm.h

+0 −3
Original line number Diff line number Diff line
@@ -670,9 +670,6 @@ struct snd_soc_dapm_context { 
	enum snd_soc_bias_level target_bias_level;

	struct list_head list;



	int (*set_bias_level)(struct snd_soc_dapm_context *dapm,

			      enum snd_soc_bias_level level);



	struct snd_soc_dapm_wcache path_sink_cache;

	struct snd_soc_dapm_wcache path_source_cache;

sound/soc/soc-component.c

+9 −0
Original line number Diff line number Diff line
@@ -68,6 +68,15 @@ int snd_soc_component_stream_event(struct snd_soc_component *component, 
	return 0;

}



int snd_soc_component_set_bias_level(struct snd_soc_component *component,

				     enum snd_soc_bias_level level)

{

	if (component->driver->set_bias_level)

		return component->driver->set_bias_level(component, level);



	return 0;

}



int snd_soc_component_enable_pin(struct snd_soc_component *component,

				 const char *pin)

{

sound/soc/soc-core.c

+0 −10
Original line number Diff line number Diff line
@@ -2646,14 +2646,6 @@ int snd_soc_register_dai(struct snd_soc_component *component, 
}

EXPORT_SYMBOL_GPL(snd_soc_register_dai);



static int snd_soc_component_set_bias_level(struct snd_soc_dapm_context *dapm,

					enum snd_soc_bias_level level)

{

	struct snd_soc_component *component = dapm->component;



	return component->driver->set_bias_level(component, level);

}



static int snd_soc_component_initialize(struct snd_soc_component *component,

	const struct snd_soc_component_driver *driver, struct device *dev)

{
@@ -2674,8 +2666,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, 
	dapm->bias_level = SND_SOC_BIAS_OFF;

	dapm->idle_bias_off = !driver->idle_bias_on;

	dapm->suspend_bias_off = driver->suspend_bias_off;

	if (driver->set_bias_level)

		dapm->set_bias_level = snd_soc_component_set_bias_level;



	INIT_LIST_HEAD(&component->dai_list);

	mutex_init(&component->io_mutex);

sound/soc/soc-dapm.c

+2 −2
Original line number Diff line number Diff line
@@ -684,8 +684,8 @@ int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm, 
{

	int ret = 0;



	if (dapm->set_bias_level)

		ret = dapm->set_bias_level(dapm, level);

	if (dapm->component)

		ret = snd_soc_component_set_bias_level(dapm->component, level);



	if (ret == 0)

		dapm->bias_level = level;

CRA Git | Maintained and supported by SUSTech CRA and CCSE