diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-07-26 13:51:39 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-05 16:23:51 +0100 |
| commit | 8e2a990d76aced95c6f01c2d67d8835c86f0ca67 (patch) | |
| tree | 7110f3600a3bf124ce90ff67bbfb3dad3d75889d /include | |
| parent | 9d415fbf773f162a5c274e671741c6fa94b74287 (diff) | |
| download | linux-stable-8e2a990d76aced95c6f01c2d67d8835c86f0ca67.tar.gz linux-stable-8e2a990d76aced95c6f01c2d67d8835c86f0ca67.tar.bz2 linux-stable-8e2a990d76aced95c6f01c2d67d8835c86f0ca67.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-component.h | 2 | ||||
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index 7ac903c1e33f..1f84f04e2670 100644 --- 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 a03db6f8faa8..c2f14a335891 100644 --- 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); |