ASoC: simple_card_utils.c: use asoc_dummy_dlc

Now we can share asoc_dummy_dlc. This patch use it.

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

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index a3f3f3a..0e46f98 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -73,7 +73,6 @@ struct asoc_simple_priv {
        struct snd_soc_dai_link *dai_link;
        struct asoc_simple_dai *dais;
        struct snd_soc_dai_link_component *dlcs;
-       struct snd_soc_dai_link_component dummy;
        struct snd_soc_codec_conf *codec_conf;
        struct gpio_desc *pa_gpio;
        const struct snd_soc_ops *ops;

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 467edd9..b5ac0f0 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -889,11 +889,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
        dev_dbg(dev, "link %d, dais %d, ccnf %d\n",
                li->link, dai_num, cnf_num);
 
-       /* dummy CPU/Codec */
-       priv->dummy.of_node     = NULL;
-       priv->dummy.dai_name    = "snd-soc-dummy-dai";
-       priv->dummy.name        = "snd-soc-dummy";
-
        priv->dai_props         = dai_props;
        priv->dai_link          = dai_link;
        priv->dais              = dais;
@@ -919,7 +914,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
                } else {
                        /* DPCM Be's CPU = dummy */
                        dai_props[i].cpus       =
-                       dai_link[i].cpus        = &priv->dummy;
+                       dai_link[i].cpus        = &asoc_dummy_dlc;
                        dai_props[i].num.cpus   =
                        dai_link[i].num_cpus    = 1;
                }
@@ -943,7 +938,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
                } else {
                        /* DPCM Fe's Codec = dummy */
                        dai_props[i].codecs     =
-                       dai_link[i].codecs      = &priv->dummy;
+                       dai_link[i].codecs      = &asoc_dummy_dlc;
                        dai_props[i].num.codecs =
                        dai_link[i].num_codecs  = 1;
                }