ASoC: atmel: remove unnecessary dai_link->platform

dai_link->platform is no longer needed if CPU and Platform are
same Component. This patch removes unnecessary dai_link->platform.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/87mt43jd00.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index 9883e6867fd12f12228d912ade968664bde8fc8d..007ab746973d28822ed0a1bcd8143b6d0db75b00 100644 (file)
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -473,24 +473,21 @@ static int atmel_classd_asoc_card_init(struct device *dev,
        if (!dai_link)
                return -ENOMEM;
 
-       comp = devm_kzalloc(dev, 3 * sizeof(*comp), GFP_KERNEL);
+       comp = devm_kzalloc(dev, 2 * sizeof(*comp), GFP_KERNEL);
        if (!comp)
                return -ENOMEM;
 
        dai_link->cpus          = &comp[0];
        dai_link->codecs        = &comp[1];
-       dai_link->platforms     = &comp[2];
 
        dai_link->num_cpus      = 1;
        dai_link->num_codecs    = 1;
-       dai_link->num_platforms = 1;
 
        dai_link->name                  = "CLASSD";
        dai_link->stream_name           = "CLASSD PCM";
        dai_link->codecs->dai_name      = "snd-soc-dummy-dai";
        dai_link->cpus->dai_name        = dev_name(dev);
        dai_link->codecs->name          = "snd-soc-dummy";
-       dai_link->platforms->name       = dev_name(dev);
 
        card->dai_link  = dai_link;
        card->num_links = 1;

diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c
index 12cd40b156440bf37159afff33848fc589659ad8..00c7b3a34ef5197080b1d6939fe894015a368514 100644 (file)
--- a/sound/soc/atmel/atmel-pdmic.c
+++ b/sound/soc/atmel/atmel-pdmic.c
@@ -496,24 +496,21 @@ static int atmel_pdmic_asoc_card_init(struct device *dev,
        if (!dai_link)
                return -ENOMEM;
 
-       comp = devm_kzalloc(dev, 3 * sizeof(*comp), GFP_KERNEL);
+       comp = devm_kzalloc(dev, 2 * sizeof(*comp), GFP_KERNEL);
        if (!comp)
                return -ENOMEM;
 
        dai_link->cpus          = &comp[0];
        dai_link->codecs        = &comp[1];
-       dai_link->platforms     = &comp[2];
 
        dai_link->num_cpus      = 1;
        dai_link->num_codecs    = 1;
-       dai_link->num_platforms = 1;
 
        dai_link->name                  = "PDMIC";
        dai_link->stream_name           = "PDMIC PCM";
        dai_link->codecs->dai_name      = "snd-soc-dummy-dai";
        dai_link->cpus->dai_name        = dev_name(dev);
        dai_link->codecs->name          = "snd-soc-dummy";
-       dai_link->platforms->name       = dev_name(dev);
 
        card->dai_link  = dai_link;
        card->num_links = 1;