OSDN Git Service

ASoC: qcom: apq8016_sbc: don't select unnecessary Platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 19 Jun 2019 01:17:22 +0000 (10:17 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 19 Jun 2019 11:52:27 +0000 (12:52 +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/qcom/apq8016_sbc.c

index 717542c..9ac7c9d 100644 (file)
@@ -159,15 +159,12 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)
 
        link = data->dai_link;
 
-       dlc = devm_kzalloc(dev, 2 * sizeof(*dlc), GFP_KERNEL);
+       dlc = devm_kzalloc(dev, sizeof(*dlc), GFP_KERNEL);
        if (!dlc)
                return ERR_PTR(-ENOMEM);
 
-       link->cpus      = &dlc[0];
-       link->platforms = &dlc[1];
-
-       link->num_cpus          = 1;
-       link->num_platforms     = 1;
+       link->cpus      = dlc;
+       link->num_cpus  = 1;
 
        for_each_child_of_node(node, np) {
                cpu = of_get_child_by_name(np, "cpu");
@@ -199,7 +196,6 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)
                        goto error;
                }
 
-               link->platforms->of_node = link->cpus->of_node;
                ret = of_property_read_string(np, "link-name", &link->name);
                if (ret) {
                        dev_err(card->dev, "error getting codec dai_link name\n");