Unverified Commit 9d415fbf authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: move snd_soc_component_seq_notifier() 



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

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

We can directly call it via driver->seq_notifier.
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_seq_notifier() to soc-component.c,
and updates parameters.
dapm->seq_notifier is no longer needed

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


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

include/sound/soc-component.h

+3 −0
Original line number Diff line number Diff line
@@ -281,6 +281,9 @@ int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id, 
int snd_soc_component_set_jack(struct snd_soc_component *component,

			       struct snd_soc_jack *jack, void *data);



void snd_soc_component_seq_notifier(struct snd_soc_component *component,

				    enum snd_soc_dapm_type type, int subseq);



#ifdef CONFIG_REGMAP

void snd_soc_component_init_regmap(struct snd_soc_component *component,

				   struct regmap *regmap);

include/sound/soc-dapm.h

+0 −2
Original line number Diff line number Diff line
@@ -661,8 +661,6 @@ struct snd_soc_dapm_context { 
	unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */

	/* Go to BIAS_OFF in suspend if the DAPM context is idle */

	unsigned int suspend_bias_off:1;

	void (*seq_notifier)(struct snd_soc_dapm_context *,

			     enum snd_soc_dapm_type, int);



	struct device *dev; /* from parent - for debug */

	struct snd_soc_component *component; /* parent component */

sound/soc/soc-component.c

+7 −0
Original line number Diff line number Diff line
@@ -52,6 +52,13 @@ int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id, 
}

EXPORT_SYMBOL_GPL(snd_soc_component_set_pll);



void snd_soc_component_seq_notifier(struct snd_soc_component *component,

				    enum snd_soc_dapm_type type, int subseq)

{

	if (component->driver->seq_notifier)

		component->driver->seq_notifier(component, type, subseq);

}



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 void snd_soc_component_seq_notifier(struct snd_soc_dapm_context *dapm,

	enum snd_soc_dapm_type type, int subseq)

{

	struct snd_soc_component *component = dapm->component;



	component->driver->seq_notifier(component, type, subseq);

}



static int snd_soc_component_stream_event(struct snd_soc_dapm_context *dapm,

	int event)

{
@@ -2690,8 +2682,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->seq_notifier)

		dapm->seq_notifier = snd_soc_component_seq_notifier;

	if (driver->stream_event)

		dapm->stream_event = snd_soc_component_stream_event;

	if (driver->set_bias_level)

sound/soc/soc-dapm.c

+8 −7
Original line number Diff line number Diff line
@@ -1611,12 +1611,12 @@ static void dapm_seq_run(struct snd_soc_card *card, 
			if (!list_empty(&pending))

				dapm_seq_run_coalesced(card, &pending);



			if (cur_dapm && cur_dapm->seq_notifier) {

			if (cur_dapm && cur_dapm->component) {

				for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)

					if (sort[i] == cur_sort)

						cur_dapm->seq_notifier(cur_dapm,

								       i,

								       cur_subseq);

						snd_soc_component_seq_notifier(

							cur_dapm->component,

							i, cur_subseq);

			}



			if (cur_dapm && w->dapm != cur_dapm)
@@ -1674,10 +1674,11 @@ static void dapm_seq_run(struct snd_soc_card *card, 
	if (!list_empty(&pending))

		dapm_seq_run_coalesced(card, &pending);



	if (cur_dapm && cur_dapm->seq_notifier) {

	if (cur_dapm && cur_dapm->component) {

		for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)

			if (sort[i] == cur_sort)

				cur_dapm->seq_notifier(cur_dapm,

				snd_soc_component_seq_notifier(

					cur_dapm->component,

					i, cur_subseq);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE