ASoC: ti: omap-hdmi: use modern dai_link style

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>

diff --git a/sound/soc/ti/omap-hdmi.c b/sound/soc/ti/omap-hdmi.c
index 673a9eb153b22e0e1e4572735abda3efe2c63871..11c1440da2266d421c289b191b8f328be7bb1cfe 100644 (file)
--- a/sound/soc/ti/omap-hdmi.c
+++ b/sound/soc/ti/omap-hdmi.c
@@ -321,6 +321,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
        struct hdmi_audio_data *ad;
        struct snd_soc_dai_driver *dai_drv;
        struct snd_soc_card *card;
+       struct snd_soc_dai_link_component *compnent;
        int ret;
 
        if (!ha) {
@@ -371,12 +372,23 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
                devm_kzalloc(dev, sizeof(*(card->dai_link)), GFP_KERNEL);
        if (!card->dai_link)
                return -ENOMEM;
+
+       compnent = devm_kzalloc(dev, 3 * sizeof(*compnent), GFP_KERNEL);
+       if (!compnent)
+               return -ENOMEM;
+       card->dai_link->cpus            = &compnent[0];
+       card->dai_link->num_cpus        = 1;
+       card->dai_link->codecs          = &compnent[1];
+       card->dai_link->num_codecs      = 1;
+       card->dai_link->platforms       = &compnent[2];
+       card->dai_link->num_platforms   = 1;
+
        card->dai_link->name = card->name;
        card->dai_link->stream_name = card->name;
-       card->dai_link->cpu_dai_name = dev_name(ad->dssdev);
-       card->dai_link->platform_name = dev_name(ad->dssdev);
-       card->dai_link->codec_name = "snd-soc-dummy";
-       card->dai_link->codec_dai_name = "snd-soc-dummy-dai";
+       card->dai_link->cpus->dai_name = dev_name(ad->dssdev);
+       card->dai_link->platforms->name = dev_name(ad->dssdev);
+       card->dai_link->codecs->name = "snd-soc-dummy";
+       card->dai_link->codecs->dai_name = "snd-soc-dummy-dai";
        card->num_links = 1;
        card->dev = dev;