OSDN Git Service

ASoC: sunxi: sun4i-codec: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:18:19 +0000 (13:18 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 21:07:31 +0000 (22:07 +0100)
ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sunxi/sun4i-codec.c

index 28d2f77..161444f 100644 (file)
@@ -1305,15 +1305,25 @@ static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev,
 {
        struct snd_soc_dai_link *link = devm_kzalloc(dev, sizeof(*link),
                                                     GFP_KERNEL);
-       if (!link)
+       struct snd_soc_dai_link_component *dlc = devm_kzalloc(dev,
+                                               3 * sizeof(*dlc), GFP_KERNEL);
+       if (!link || !dlc)
                return NULL;
 
+       link->cpus      = &dlc[0];
+       link->codecs    = &dlc[1];
+       link->platforms = &dlc[2];
+
+       link->num_cpus          = 1;
+       link->num_codecs        = 1;
+       link->num_platforms     = 1;
+
        link->name              = "cdc";
        link->stream_name       = "CDC PCM";
-       link->codec_dai_name    = "Codec";
-       link->cpu_dai_name      = dev_name(dev);
-       link->codec_name        = dev_name(dev);
-       link->platform_name     = dev_name(dev);
+       link->codecs->dai_name  = "Codec";
+       link->cpus->dai_name    = dev_name(dev);
+       link->codecs->name      = dev_name(dev);
+       link->platforms->name   = dev_name(dev);
        link->dai_fmt           = SND_SOC_DAIFMT_I2S;
 
        *num_links = 1;