ASoC: soc-core: remove legacy style of codec_conf

Now all driver is using snd_soc_dai_link_component for codec_conf.
Let's remove legacy style

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/871rt959ic.wl-kuninori.morimoto.gx@renesas.com
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index a94e5d2fc2b2d9ff8ec1633d22be4bea8decb30b..9787c80e548b86c21416954396401a8444e1ee02 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -960,9 +960,6 @@ struct snd_soc_codec_conf {
         * specify device either by device name, or by
         * DT/OF node, but not both.
         */
-       const char *dev_name;
-       struct device_node *of_node;
-
        struct snd_soc_dai_link_component dlc;
 
        /*

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 411b83ba2fc014c6dcafbb8142bb6c5a943444dc..0bd2cb2e7a67abd684b3fac0280ea278c3bdd36e 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1185,12 +1185,6 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
        for (i = 0; i < card->num_configs; i++) {
                struct snd_soc_codec_conf *map = &card->codec_conf[i];
 
-               /* fixme */
-               if (map->dev_name)
-                       map->dlc.name = map->dev_name;
-               if (map->of_node)
-                       map->dlc.of_node = map->of_node;
-
                if (snd_soc_is_matching_component(&map->dlc, component)) {
                        component->name_prefix = map->name_prefix;
                        return;