diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2020-02-17 17:27:53 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-02-18 23:37:00 +0000 |
| commit | 027a483871832044fa0cb8e9df208cca5230ae91 (patch) | |
| tree | ee90ff1e38abc50d79f573434b3abc15b072a554 | |
| parent | c2cd821603c216a6a7242b2b4c1a093051e26aaf (diff) | |
| download | linux-stable-027a483871832044fa0cb8e9df208cca5230ae91.tar.gz linux-stable-027a483871832044fa0cb8e9df208cca5230ae91.tar.bz2 linux-stable-027a483871832044fa0cb8e9df208cca5230ae91.zip | |
ASoC: soc-pcm: use dpcm_get_be() at dpcm_end_walk_at_be()
dpcm_end_walk_at_be() and dpcm_get_be() are almost same code.
This patch uses dpcm_get_be() from dpcm_end_walk_at_be().
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87d0adbouh.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-pcm.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 7d4419ae63f6..1d48be24bfaa 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1297,10 +1297,7 @@ static bool dpcm_end_walk_at_be(struct snd_soc_dapm_widget *widget, { struct snd_soc_card *card = widget->dapm->card; struct snd_soc_pcm_runtime *rtd; - struct snd_soc_dapm_widget *w; - struct snd_soc_dai *dai; int stream; - int i; /* adjust dir to stream */ if (dir == SND_SOC_DAPM_DIR_OUT) @@ -1308,20 +1305,9 @@ static bool dpcm_end_walk_at_be(struct snd_soc_dapm_widget *widget, else stream = SNDRV_PCM_STREAM_CAPTURE; - for_each_card_rtds(card, rtd) { - if (!rtd->dai_link->no_pcm) - continue; - - w = dai_get_widget(rtd->cpu_dai, stream); - if (w == widget) - return true; - - for_each_rtd_codec_dai(rtd, i, dai) { - w = dai_get_widget(dai, stream); - if (w == widget) - return true; - } - } + rtd = dpcm_get_be(card, widget, stream); + if (rtd) + return true; return false; } |