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

Commit e984fd61 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card: use devm_get_clk_from_child() 



Current simple-card-utils is getting clk by of_clk_get(), but didn't call
clk_free(). Now we can use devm_get_clk_from_child() for this purpose.
Let's use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74

include/sound/simple_card_utils.h

+6 −5
Original line number Diff line number Diff line
@@ -34,11 +34,12 @@ int asoc_simple_card_set_dailink_name(struct device *dev, 
int asoc_simple_card_parse_card_name(struct snd_soc_card *card,

				     char *prefix);



#define asoc_simple_card_parse_clk_cpu(node, dai_link, simple_dai)		\

	asoc_simple_card_parse_clk(node, dai_link->cpu_of_node, simple_dai)

#define asoc_simple_card_parse_clk_codec(node, dai_link, simple_dai)		\

	asoc_simple_card_parse_clk(node, dai_link->codec_of_node, simple_dai)

int asoc_simple_card_parse_clk(struct device_node *node,

#define asoc_simple_card_parse_clk_cpu(dev, node, dai_link, simple_dai)		\

	asoc_simple_card_parse_clk(dev, node, dai_link->cpu_of_node, simple_dai)

#define asoc_simple_card_parse_clk_codec(dev, node, dai_link, simple_dai)	\

	asoc_simple_card_parse_clk(dev, node, dai_link->codec_of_node, simple_dai)

int asoc_simple_card_parse_clk(struct device *dev,

			       struct device_node *node,

			       struct device_node *dai_of_node,

			       struct asoc_simple_dai *simple_dai);

sound/soc/generic/simple-card-utils.c

+4 −4
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, 
}

EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name);



int asoc_simple_card_parse_clk(struct device_node *node,

int asoc_simple_card_parse_clk(struct device *dev,

			       struct device_node *node,

			       struct device_node *dai_of_node,

			       struct asoc_simple_dai *simple_dai)

{
@@ -111,14 +112,13 @@ int asoc_simple_card_parse_clk(struct device_node *node, 
	 *  or "system-clock-frequency = <xxx>"

	 *  or device's module clock.

	 */

	clk = of_clk_get(node, 0);

	clk = devm_get_clk_from_child(dev, node, NULL);

	if (!IS_ERR(clk)) {

		simple_dai->sysclk = clk_get_rate(clk);

		simple_dai->clk = clk;

	} else if (!of_property_read_u32(node, "system-clock-frequency", &val)) {

		simple_dai->sysclk = val;

	} else {

		clk = of_clk_get(dai_of_node, 0);

		clk = devm_get_clk_from_child(dev, dai_of_node, NULL);

		if (!IS_ERR(clk))

			simple_dai->sysclk = clk_get_rate(clk);

	}

sound/soc/generic/simple-card.c

+2 −2
Original line number Diff line number Diff line
@@ -278,11 +278,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, 
	if (ret < 0)

		goto dai_link_of_err;



	ret = asoc_simple_card_parse_clk_cpu(cpu, dai_link, cpu_dai);

	ret = asoc_simple_card_parse_clk_cpu(dev, cpu, dai_link, cpu_dai);

	if (ret < 0)

		goto dai_link_of_err;



	ret = asoc_simple_card_parse_clk_codec(codec, dai_link, codec_dai);

	ret = asoc_simple_card_parse_clk_codec(dev, codec, dai_link, codec_dai);

	if (ret < 0)

		goto dai_link_of_err;

sound/soc/generic/simple-scu-card.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, 
		if (ret)

			return ret;



		ret = asoc_simple_card_parse_clk_cpu(np, dai_link, dai_props);

		ret = asoc_simple_card_parse_clk_cpu(dev, np, dai_link, dai_props);

		if (ret < 0)

			return ret;
@@ -153,7 +153,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, 
		if (ret < 0)

			return ret;



		ret = asoc_simple_card_parse_clk_codec(np, dai_link, dai_props);

		ret = asoc_simple_card_parse_clk_codec(dev, np, dai_link, dai_props);

		if (ret < 0)

			return ret;