Commit d1eb6d11 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new()

Now CPU/Codec DAIs are alias for dais.
Thus, we can directly use for_each_rtd_dais() macro
for soc_dai_pcm_new().
This patch merge CPU/Codec for it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87r1xsolen.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent c840f769
...@@ -1037,20 +1037,20 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, ...@@ -1037,20 +1037,20 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
} }
EXPORT_SYMBOL_GPL(snd_soc_add_pcm_runtime); EXPORT_SYMBOL_GPL(snd_soc_add_pcm_runtime);
static int soc_dai_pcm_new(struct snd_soc_dai **dais, int num_dais, static int soc_dai_pcm_new(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_dai *dai;
int i, ret = 0; int i, ret = 0;
for (i = 0; i < num_dais; ++i) { for_each_rtd_dais(rtd, i, dai) {
struct snd_soc_dai_driver *drv = dais[i]->driver; struct snd_soc_dai_driver *drv = dai->driver;
if (drv->pcm_new) if (drv->pcm_new)
ret = drv->pcm_new(rtd, dais[i]); ret = drv->pcm_new(rtd, dai);
if (ret < 0) { if (ret < 0) {
dev_err(dais[i]->dev, dev_err(dai->dev,
"ASoC: Failed to bind %s with pcm device\n", "ASoC: Failed to bind %s with pcm device\n",
dais[i]->name); dai->name);
return ret; return ret;
} }
} }
...@@ -1121,13 +1121,8 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, ...@@ -1121,13 +1121,8 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,
dai_link->stream_name, ret); dai_link->stream_name, ret);
return ret; return ret;
} }
ret = soc_dai_pcm_new(rtd->cpu_dais,
rtd->num_cpus, rtd); return soc_dai_pcm_new(rtd);
if (ret < 0)
return ret;
ret = soc_dai_pcm_new(rtd->codec_dais,
rtd->num_codecs, rtd);
return ret;
} }
static void soc_set_name_prefix(struct snd_soc_card *card, static void soc_set_name_prefix(struct snd_soc_card *card,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment