leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: soc.h: use array instead of playback/capture_widget

Browse Source 
snd_soc_pcm_runtime has playback/capture_widget for Codec2Coddec.
The naming is unclear.
This patch names it as c2c_widget and uses array.

	struct snd_soc_pcm_runtime {
		...
=>		struct snd_soc_dapm_widget *playback_widget;
=>		struct snd_soc_dapm_widget *capture_widget;
		...
	}

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87pmfqv9mk.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2022-09-20 06:32:36 +00:00 committed by Mark Brown
parent a26ec2acb2
commit 3289dc026a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sound/soc.h
View File

@ -1063,6 +1063,7 @@ struct snd_soc_pcm_runtime {
/* Dynamic PCM BE runtime data */ /* Dynamic PCM BE runtime data */
struct snd_soc_dpcm_runtime dpcm[SNDRV_PCM_STREAM_LAST + 1]; struct snd_soc_dpcm_runtime dpcm[SNDRV_PCM_STREAM_LAST + 1];
struct snd_soc_dapm_widget *c2c_widget[SNDRV_PCM_STREAM_LAST + 1];
long pmdown_time; long pmdown_time;
@ -1079,9 +1080,6 @@ struct snd_soc_pcm_runtime {
*/ */
struct snd_soc_dai **dais; struct snd_soc_dai **dais;
struct snd_soc_dapm_widget *playback_widget;
struct snd_soc_dapm_widget *capture_widget;
struct delayed_work delayed_work; struct delayed_work delayed_work;
void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd); void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS

19
sound/soc/soc-dapm.c
View File

@ -4361,6 +4361,7 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card,
struct snd_soc_dapm_widget *dai, *codec, *playback_cpu, *capture_cpu; struct snd_soc_dapm_widget *dai, *codec, *playback_cpu, *capture_cpu;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
struct snd_pcm_str *streams = rtd->pcm->streams; struct snd_pcm_str *streams = rtd->pcm->streams;
int stream;
if (dai_link->params) { if (dai_link->params) {
playback_cpu = cpu_dai->capture_widget; playback_cpu = cpu_dai->capture_widget;
@ -4371,37 +4372,39 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card,
} }
/* connect BE DAI playback if widgets are valid */ /* connect BE DAI playback if widgets are valid */
stream = SNDRV_PCM_STREAM_PLAYBACK;
codec = codec_dai->playback_widget; codec = codec_dai->playback_widget;
if (playback_cpu && codec) { if (playback_cpu && codec) {
if (dai_link->params && !rtd->playback_widget) { if (dai_link->params && !rtd->c2c_widget[stream]) {
substream = streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream = streams[stream].substream;
dai = snd_soc_dapm_new_dai(card, substream, "playback"); dai = snd_soc_dapm_new_dai(card, substream, "playback");
if (IS_ERR(dai)) if (IS_ERR(dai))
goto capture; goto capture;
rtd->playback_widget = dai; rtd->c2c_widget[stream] = dai;
} }
dapm_connect_dai_routes(&card->dapm, cpu_dai, playback_cpu, dapm_connect_dai_routes(&card->dapm, cpu_dai, playback_cpu,
rtd->playback_widget, rtd->c2c_widget[stream],
codec_dai, codec); codec_dai, codec);
} }
capture: capture:
/* connect BE DAI capture if widgets are valid */ /* connect BE DAI capture if widgets are valid */
stream = SNDRV_PCM_STREAM_CAPTURE;
codec = codec_dai->capture_widget; codec = codec_dai->capture_widget;
if (codec && capture_cpu) { if (codec && capture_cpu) {
if (dai_link->params && !rtd->capture_widget) { if (dai_link->params && !rtd->c2c_widget[stream]) {
substream = streams[SNDRV_PCM_STREAM_CAPTURE].substream; substream = streams[stream].substream;
dai = snd_soc_dapm_new_dai(card, substream, "capture"); dai = snd_soc_dapm_new_dai(card, substream, "capture");
if (IS_ERR(dai)) if (IS_ERR(dai))
return; return;
rtd->capture_widget = dai; rtd->c2c_widget[stream] = dai;
} }
dapm_connect_dai_routes(&card->dapm, codec_dai, codec, dapm_connect_dai_routes(&card->dapm, codec_dai, codec,
rtd->capture_widget, rtd->c2c_widget[stream],
cpu_dai, capture_cpu); cpu_dai, capture_cpu);
} }
} }