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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87wog54d0v.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 3ed2c39e45c2ce674e4c902ac6b14284213c0bc5..7ac903c1e33f2fbb25a9f4e3089f0d1a6c78e6fe 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -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);

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 6c66941601307270ab1bc1e7dc4edb6f9a2d3f3b..a03db6f8faa8eb2bfc4d1307c09090e4477e8da9 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -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 */

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index de1bc5196f67e82b2ab4b6a5dfef5f63a38dc2b9..ca0b28b1d91895f867f6561218775ea268e6a159 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -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)
 {

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2f068c239f343d2d61e41a21efbcf8d547bf9f54..c618fecc3d459cb7699a79103bcd87073402d589 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d93c1038fab0d391cd7c3b783fbfd775e402661d..0b60f688b4338df5fa7df61450d04aaff17511e2 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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,11 +1674,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);
        }
 
        list_for_each_entry(d, &card->dapm_list, list) {