Unverified Commit aaa68472 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: arndale: Simplify DAI link initialization 



There is only one DAI link so we can drop an unnecessary loop statement.
Use card->dai_link in place of direct static arndale_rt5631_dai[] array
dereference as a prerequisite for adding support for other CODECs.
Unnecessary assignment of dai_link->codecs->name to NULL is removed.

Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Link: https://lore.kernel.org/r/20191002105652.24821-1-s.nawrocki@samsung.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 25317997

sound/soc/samsung/arndale_rt5631.c

+18 −24
Original line number Diff line number Diff line
@@ -88,37 +88,31 @@ static void arndale_put_of_nodes(struct snd_soc_card *card) 


static int arndale_audio_probe(struct platform_device *pdev)

{

	int n, ret;

	struct device_node *np = pdev->dev.of_node;

	struct snd_soc_card *card = &arndale_rt5631;

	struct snd_soc_dai_link *dai_link;

	int ret;



	card->dev = &pdev->dev;

	dai_link = card->dai_link;



	for (n = 0; np && n < ARRAY_SIZE(arndale_rt5631_dai); n++) {

		if (!arndale_rt5631_dai[n].cpus->dai_name) {

			arndale_rt5631_dai[n].cpus->of_node = of_parse_phandle(np,

					"samsung,audio-cpu", n);



			if (!arndale_rt5631_dai[n].cpus->of_node) {

	dai_link->cpus->of_node = of_parse_phandle(np, "samsung,audio-cpu", 0);

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

		dev_err(&pdev->dev,

			"Property 'samsung,audio-cpu' missing or invalid\n");

		return -EINVAL;

	}

		}

		if (!arndale_rt5631_dai[n].platforms->name)

			arndale_rt5631_dai[n].platforms->of_node =

					arndale_rt5631_dai[n].cpus->of_node;



		arndale_rt5631_dai[n].codecs->name = NULL;

		arndale_rt5631_dai[n].codecs->of_node = of_parse_phandle(np,

					"samsung,audio-codec", n);

		if (!arndale_rt5631_dai[0].codecs->of_node) {



	if (!dai_link->platforms->name)

		dai_link->platforms->of_node = dai_link->cpus->of_node;



	dai_link->codecs->of_node = of_parse_phandle(np, "samsung,audio-codec", 0);

	if (!dai_link->codecs->of_node) {

		dev_err(&pdev->dev,

			"Property 'samsung,audio-codec' missing or invalid\n");

		ret = -EINVAL;

		goto err_put_of_nodes;

	}

	}



	ret = devm_snd_soc_register_card(card->dev, card);

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE