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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ee8jt7d3.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/meson/meson-codec-glue.c b/sound/soc/meson/meson-codec-glue.c
index d07270d17cee7b3cf2f28527ee56b87bfad25a22..2870cfad813ac7bf6ea0fe3c839f4d3384ebad5a 100644 (file)
--- a/sound/soc/meson/meson-codec-glue.c
+++ b/sound/soc/meson/meson-codec-glue.c
@@ -113,9 +113,6 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,
        /* Replace link params with the input 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);
 }
 EXPORT_SYMBOL_GPL(meson_codec_glue_output_startup);

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6253cfea827c1df88e1b4469d512da16e3cc4207..bdbaf14dc9fcc83bd76bac99063377e8139bd950 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1218,6 +1218,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
        unsigned int i;
        int ret;
 
+       if (!dai_fmt)
+               return 0;
+
        for_each_rtd_codec_dais(rtd, i, codec_dai) {
                ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
                if (ret != 0 && ret != -ENOTSUPP)
@@ -1261,11 +1264,9 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,
                return ret;
 
        snd_soc_runtime_get_dai_fmt(rtd);
-       if (dai_link->dai_fmt) {
-               ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);
-               if (ret)
-                       return ret;
-       }
+       ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);
+       if (ret)
+               return ret;
 
        /* add DPCM sysfs entries */
        soc_dpcm_debugfs_add(rtd);