ASoC: meson: 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/87zg6yypit.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org

diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index a25c397..74e7cf0 100644 (file)
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -120,20 +120,18 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
        if (!lb->name)
                return -ENOMEM;
 
-       dlc = devm_kzalloc(card->dev, 2 * sizeof(*dlc), GFP_KERNEL);
+       dlc = devm_kzalloc(card->dev, sizeof(*dlc), GFP_KERNEL);
        if (!dlc)
                return -ENOMEM;
 
-       lb->cpus = &dlc[0];
-       lb->codecs = &dlc[1];
+       lb->cpus = dlc;
+       lb->codecs = &asoc_dummy_dlc;
        lb->num_cpus = 1;
        lb->num_codecs = 1;
 
        lb->stream_name = lb->name;
        lb->cpus->of_node = pad->cpus->of_node;
        lb->cpus->dai_name = "TDM Loopback";
-       lb->codecs->name = "snd-soc-dummy";
-       lb->codecs->dai_name = "snd-soc-dummy-dai";
        lb->dpcm_capture = 1;
        lb->no_pcm = 1;
        lb->ops = &axg_card_tdm_be_ops;

diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c
index 2d8d571..ffc5111 100644 (file)
--- a/sound/soc/meson/meson-card-utils.c
+++ b/sound/soc/meson/meson-card-utils.c
@@ -183,21 +183,13 @@ int meson_card_set_fe_link(struct snd_soc_card *card,
                           struct device_node *node,
                           bool is_playback)
 {
-       struct snd_soc_dai_link_component *codec;
-
-       codec = devm_kzalloc(card->dev, sizeof(*codec), GFP_KERNEL);
-       if (!codec)
-               return -ENOMEM;
-
-       link->codecs = codec;
+       link->codecs = &asoc_dummy_dlc;
        link->num_codecs = 1;
 
        link->dynamic = 1;
        link->dpcm_merged_format = 1;
        link->dpcm_merged_chan = 1;
        link->dpcm_merged_rate = 1;
-       link->codecs->dai_name = "snd-soc-dummy-dai";
-       link->codecs->name = "snd-soc-dummy";
 
        if (is_playback)
                link->dpcm_playback = 1;