]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ASoC: fsl: imx-sgtl5000: don't select unnecessary Platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 19 Jun 2019 01:16:57 +0000 (10:16 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 19 Jun 2019 11:50:51 +0000 (12:50 +0100)
ALSA SoC is now supporting "no Platform". Sound card doesn't need to
select "CPU component" as "Platform" anymore if it doesn't need
special Platform.
This patch removes such settings.

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

index 15e8b9343c35442a9c99a8339a3984552a5c541e..c5ebe49505678e9dcf9a1d2d71ca15b8ef47ed2e 100644 (file)
@@ -123,7 +123,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
                goto fail;
        }
 
-       comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);
+       comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL);
        if (!comp) {
                ret = -ENOMEM;
                goto fail;
@@ -139,18 +139,15 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
        data->dai.cpus          = &comp[0];
        data->dai.codecs        = &comp[1];
-       data->dai.platforms     = &comp[2];
 
        data->dai.num_cpus      = 1;
        data->dai.num_codecs    = 1;
-       data->dai.num_platforms = 1;
 
        data->dai.name = "HiFi";
        data->dai.stream_name = "HiFi";
        data->dai.codecs->dai_name = "sgtl5000";
        data->dai.codecs->of_node = codec_np;
        data->dai.cpus->of_node = ssi_np;
-       data->dai.platforms->of_node = ssi_np;
        data->dai.init = &imx_sgtl5000_dai_init;
        data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                            SND_SOC_DAIFMT_CBM_CFM;