diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-07-26 06:51:43 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-05 17:24:17 +0200 |
| commit | 7951b14611851bdae18e9bca18015b1d84731d0d (patch) | |
| tree | 174514bb2129b10a535b86a99eac505e4a7ba197 /sound/soc/soc-dapm.c | |
| parent | ASoC: soc-component: move snd_soc_component_stream_event() (diff) | |
| download | linux-7951b14611851bdae18e9bca18015b1d84731d0d.tar.xz linux-7951b14611851bdae18e9bca18015b1d84731d0d.zip | |
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87tvb94d0n.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9288b2b43f98..d09bdca63c62 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -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; |