ASoC: soc-component: move snd_soc_component_stream_event()

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

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

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87v9vp4d0r.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 7ac903c1e33f2fbb25a9f4e3089f0d1a6c78e6fe..1f84f04e2670415c0201ad3d2ed7ac77d7b9c33b 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -283,6 +283,8 @@ int snd_soc_component_set_jack(struct snd_soc_component *component,
 
 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);
 
 #ifdef CONFIG_REGMAP
 void snd_soc_component_init_regmap(struct snd_soc_component *component,

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index a03db6f8faa8eb2bfc4d1307c09090e4477e8da9..c2f14a3358911162d7543ded5f85951896d5e741 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -670,7 +670,6 @@ struct snd_soc_dapm_context {
        enum snd_soc_bias_level target_bias_level;
        struct list_head list;
 
-       int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
        int (*set_bias_level)(struct snd_soc_dapm_context *dapm,
                              enum snd_soc_bias_level level);
 

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index ca0b28b1d91895f867f6561218775ea268e6a159..f33dda8023ec9a1e2247cbef76d7c031ee56a2ef 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -59,6 +59,15 @@ void snd_soc_component_seq_notifier(struct snd_soc_component *component,
                component->driver->seq_notifier(component, type, subseq);
 }
 
+int snd_soc_component_stream_event(struct snd_soc_component *component,
+                                  int event)
+{
+       if (component->driver->stream_event)
+               return component->driver->stream_event(component, event);
+
+       return 0;
+}
+
 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 c618fecc3d459cb7699a79103bcd87073402d589..8cfbe5fb592116f0fd52ba601930aa4c1d34b845 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 int snd_soc_component_stream_event(struct snd_soc_dapm_context *dapm,
-       int event)
-{
-       struct snd_soc_component *component = dapm->component;
-
-       return component->driver->stream_event(component, event);
-}
-
 static int snd_soc_component_set_bias_level(struct snd_soc_dapm_context *dapm,
                                        enum snd_soc_bias_level level)
 {
@@ -2682,8 +2674,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->stream_event)
-               dapm->stream_event = snd_soc_component_stream_event;
        if (driver->set_bias_level)
                dapm->set_bias_level = snd_soc_component_set_bias_level;
 

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 0b60f688b4338df5fa7df61450d04aaff17511e2..9288b2b43f98f5809d130a97cad4044b66fef646 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1913,6 +1913,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
        LIST_HEAD(down_list);
        ASYNC_DOMAIN_EXCLUSIVE(async_domain);
        enum snd_soc_bias_level bias;
+       int ret;
 
        lockdep_assert_held(&card->dapm_mutex);
 
@@ -2029,8 +2030,12 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
 
        /* do we need to notify any clients that DAPM event is complete */
        list_for_each_entry(d, &card->dapm_list, list) {
-               if (d->stream_event)
-                       d->stream_event(d, event);
+               if (!d->component)
+                       continue;
+
+               ret = snd_soc_component_stream_event(d->component, event);
+               if (ret < 0)
+                       return ret;
        }
 
        pop_dbg(card->dev, card->pop_time,