Commit 7db07e37 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: accept zero format at snd_soc_runtime_set_dai_fmt()

Do nothing if format was zero at snd_soc_runtime_set_dai_fmt().
soc-core.c can be more simple code by this patch.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ee8jt7d3.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 41b1774f
...@@ -113,9 +113,6 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream, ...@@ -113,9 +113,6 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,
/* Replace link params with the input params */ /* Replace link params with the input params */
rtd->dai_link->params = &in_data->params; rtd->dai_link->params = &in_data->params;
if (!in_data->fmt)
return 0;
return snd_soc_runtime_set_dai_fmt(rtd, in_data->fmt); return snd_soc_runtime_set_dai_fmt(rtd, in_data->fmt);
} }
EXPORT_SYMBOL_GPL(meson_codec_glue_output_startup); EXPORT_SYMBOL_GPL(meson_codec_glue_output_startup);
......
...@@ -1218,6 +1218,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, ...@@ -1218,6 +1218,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
unsigned int i; unsigned int i;
int ret; int ret;
if (!dai_fmt)
return 0;
for_each_rtd_codec_dais(rtd, i, codec_dai) { for_each_rtd_codec_dais(rtd, i, codec_dai) {
ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt); ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
if (ret != 0 && ret != -ENOTSUPP) if (ret != 0 && ret != -ENOTSUPP)
...@@ -1261,11 +1264,9 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, ...@@ -1261,11 +1264,9 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,
return ret; return ret;
snd_soc_runtime_get_dai_fmt(rtd); snd_soc_runtime_get_dai_fmt(rtd);
if (dai_link->dai_fmt) { ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);
ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); if (ret)
if (ret) return ret;
return ret;
}
/* add DPCM sysfs entries */ /* add DPCM sysfs entries */
soc_dpcm_debugfs_add(rtd); soc_dpcm_debugfs_add(rtd);
......
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