ASoC: core: Pass legacy_dai_naming flag directly
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Fri, 13 May 2022 09:05:31 +0000 (10:05 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 16 May 2022 11:58:40 +0000 (12:58 +0100)
Passing the result of the helper function snd_soc_component_is_codec
to snd_soc_register_dai is less clear than just passing the DAI
naming flag directly. snd_soc_register_dai wants to know if it
should use the legacy DAI naming. The CODEC distinction is more
of a historical thing and not obviously directly related, and there
are already a couple of CPU side components that explicitly opt in
to non-legacy DAI naming.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220513090532.1450944-2-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index 32267a3..9574f86 100644 (file)
@@ -2497,7 +2497,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component,
 
        for (i = 0; i < count; i++) {
                dai = snd_soc_register_dai(component, dai_drv + i, count == 1 &&
-                                          !snd_soc_component_is_codec(component));
+                                          !component->driver->non_legacy_dai_naming);
                if (dai == NULL) {
                        ret = -ENOMEM;
                        goto err;