Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 98b232ca authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: qcom: apq8016_sbc: 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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1e36ea36

sound/soc/qcom/apq8016_sbc.c

+15 −4
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) 
	struct snd_soc_dai_link *link;

	struct device_node *np, *codec, *cpu, *node  = dev->of_node;

	struct apq8016_sbc_data *data;

	struct snd_soc_dai_link_component *dlc;

	int ret, num_links;



	ret = snd_soc_of_parse_card_name(card, "qcom,model");
@@ -158,6 +159,16 @@ 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);

	if (!dlc)

		return ERR_PTR(-ENOMEM);



	link->cpus	= &dlc[0];

	link->platforms	= &dlc[1];



	link->num_cpus		= 1;

	link->num_platforms	= 1;



	for_each_child_of_node(node, np) {

		cpu = of_get_child_by_name(np, "cpu");

		codec = of_get_child_by_name(np, "codec");
@@ -168,14 +179,14 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) 
			goto error;

		}



		link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0);

		if (!link->cpu_of_node) {

		link->cpus->of_node = of_parse_phandle(cpu, "sound-dai", 0);

		if (!link->cpus->of_node) {

			dev_err(card->dev, "error getting cpu phandle\n");

			ret = -EINVAL;

			goto error;

		}



		ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name);

		ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name);

		if (ret) {

			dev_err(card->dev, "error getting cpu dai name\n");

			goto error;
@@ -188,7 +199,7 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) 
			goto error;

		}



		link->platform_of_node = link->cpu_of_node;

		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");