ASoC: soc-core: remove legacy style of aux_dev

Now all drivers are using snd_soc_dai_link_component for aux_dev.
Let's remove legacy style

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

diff --git a/include/sound/soc.h b/include/sound/soc.h
index fd6ecea48fc09b08b5ae75bba2db2d9cd8b172e6..2fc56e5963f3c1ee2bc505256be3514aa01f1ba6 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -963,19 +963,10 @@ struct snd_soc_codec_conf {
 };
 
 struct snd_soc_aux_dev {
-       const char *name;               /* Codec name */
-
        /*
         * specify multi-codec either by device name, or by
         * DT/OF node, but not both.
         */
-       const char *codec_name;
-       struct device_node *codec_of_node;
-
-       /*
-        * name, codec_name, codec_of_node will be replaced
-        * into dlc. don't use both in the same time
-        */
        struct snd_soc_dai_link_component dlc;
 
        /* codec/machine specific init - e.g. add machine controls */

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 56b99e340ddabb0d60792f0a3708094f7eb3be92..4af382d526755627d98b6a0c734727f738a96030 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1538,12 +1538,6 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
        struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
        struct snd_soc_component *component;
 
-       /* remove me */
-       if (aux_dev->codec_name)
-               aux_dev->dlc.name = aux_dev->codec_name;
-       if (aux_dev->codec_of_node)
-               aux_dev->dlc.of_node = aux_dev->codec_of_node;
-
        /* codecs, usually analog devices */
        component = soc_find_component(&aux_dev->dlc);
        if (!component)