]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: simple-card-util: remove dai_link compatible code for platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 31 Aug 2018 03:11:25 +0000 (03:11 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 31 Aug 2018 14:59:02 +0000 (15:59 +0100)
Now no simple/audio cards are using legacy dai_link style for platform.
Let's remove compatible code.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/simple-card-utils.c

index 644cd62ba02779652aac22b748934028a7b79946..b400dbf1f834a121fff854ea0e913741c54df1f5 100644 (file)
@@ -376,13 +376,9 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai);
 int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link)
 {
        /* Assumes platform == cpu */
-       if (dai_link->platform) {
-               if (!dai_link->platform->of_node)
-                       dai_link->platform->of_node = dai_link->cpu_of_node;
-       } else {
-               if (!dai_link->platform_of_node)
-                       dai_link->platform_of_node = dai_link->cpu_of_node;
-       }
+       if (!dai_link->platform->of_node)
+               dai_link->platform->of_node = dai_link->cpu_of_node;
+
        return 0;
 
 }