Commit 0de6db30 authored by Sowjanya Komatineni's avatar Sowjanya Komatineni Committed by Thierry Reding
Browse files

ASoC: tegra: Use device managed resource APIs to get the clock 



tegra_asoc_utils uses clk_get() to get the clock and clk_put() to free
them explicitly.

This patch updates it to use device managed resource API devm_clk_get()
so the clock will be automatically released and freed when the device is
unbound and removes tegra_asoc_utils_fini() as its no longer needed.

Tested-by: default avatarDmitry Osipenko <digetx@gmail.com>
Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Reviewed-by: default avatarSameer Pujar <spujar@nvidia.com>
Signed-off-by: default avatarSowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 8f3d9f35

sound/soc/tegra/tegra_alc5632.c

+1 −6
Original line number Diff line number Diff line
@@ -205,13 +205,11 @@ static int tegra_alc5632_probe(struct platform_device *pdev) 
	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",

			ret);

		goto err_fini_utils;

		goto err_put_cpu_of_node;

	}



	return 0;



err_fini_utils:

	tegra_asoc_utils_fini(&alc5632->util_data);

err_put_cpu_of_node:

	of_node_put(tegra_alc5632_dai.cpus->of_node);

	tegra_alc5632_dai.cpus->of_node = NULL;
@@ -226,12 +224,9 @@ err: 
static int tegra_alc5632_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);



	snd_soc_unregister_card(card);



	tegra_asoc_utils_fini(&machine->util_data);



	of_node_put(tegra_alc5632_dai.cpus->of_node);

	tegra_alc5632_dai.cpus->of_node = NULL;

	tegra_alc5632_dai.platforms->of_node = NULL;

sound/soc/tegra/tegra_asoc_utils.c

+7 −27
Original line number Diff line number Diff line
@@ -175,52 +175,32 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, 
		return -EINVAL;

	}



	data->clk_pll_a = clk_get(dev, "pll_a");

	data->clk_pll_a = devm_clk_get(dev, "pll_a");

	if (IS_ERR(data->clk_pll_a)) {

		dev_err(data->dev, "Can't retrieve clk pll_a\n");

		ret = PTR_ERR(data->clk_pll_a);

		goto err;

		return PTR_ERR(data->clk_pll_a);

	}



	data->clk_pll_a_out0 = clk_get(dev, "pll_a_out0");

	data->clk_pll_a_out0 = devm_clk_get(dev, "pll_a_out0");

	if (IS_ERR(data->clk_pll_a_out0)) {

		dev_err(data->dev, "Can't retrieve clk pll_a_out0\n");

		ret = PTR_ERR(data->clk_pll_a_out0);

		goto err_put_pll_a;

		return PTR_ERR(data->clk_pll_a_out0);

	}



	data->clk_cdev1 = clk_get(dev, "mclk");

	data->clk_cdev1 = devm_clk_get(dev, "mclk");

	if (IS_ERR(data->clk_cdev1)) {

		dev_err(data->dev, "Can't retrieve clk cdev1\n");

		ret = PTR_ERR(data->clk_cdev1);

		goto err_put_pll_a_out0;

		return PTR_ERR(data->clk_cdev1);

	}



	ret = tegra_asoc_utils_set_rate(data, 44100, 256 * 44100);

	if (ret)

		goto err_put_cdev1;

		return ret;



	return 0;



err_put_cdev1:

	clk_put(data->clk_cdev1);

err_put_pll_a_out0:

	clk_put(data->clk_pll_a_out0);

err_put_pll_a:

	clk_put(data->clk_pll_a);

err:

	return ret;

}

EXPORT_SYMBOL_GPL(tegra_asoc_utils_init);



void tegra_asoc_utils_fini(struct tegra_asoc_utils_data *data)

{

	clk_put(data->clk_cdev1);

	clk_put(data->clk_pll_a_out0);

	clk_put(data->clk_pll_a);

}

EXPORT_SYMBOL_GPL(tegra_asoc_utils_fini);



MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");

MODULE_DESCRIPTION("Tegra ASoC utility code");

MODULE_LICENSE("GPL");

sound/soc/tegra/tegra_asoc_utils.h

+0 −1
Original line number Diff line number Diff line
@@ -34,6 +34,5 @@ int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate, 
int tegra_asoc_utils_set_ac97_rate(struct tegra_asoc_utils_data *data);

int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,

			  struct device *dev);

void tegra_asoc_utils_fini(struct tegra_asoc_utils_data *data);



#endif

sound/soc/tegra/tegra_max98090.c

+6 −16
Original line number Diff line number Diff line
@@ -218,19 +218,18 @@ static int tegra_max98090_probe(struct platform_device *pdev) 


	ret = snd_soc_of_parse_card_name(card, "nvidia,model");

	if (ret)

		goto err;

		return ret;



	ret = snd_soc_of_parse_audio_routing(card, "nvidia,audio-routing");

	if (ret)

		goto err;

		return ret;



	tegra_max98090_dai.codecs->of_node = of_parse_phandle(np,

			"nvidia,audio-codec", 0);

	if (!tegra_max98090_dai.codecs->of_node) {

		dev_err(&pdev->dev,

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

		ret = -EINVAL;

		goto err;

		return -EINVAL;

	}



	tegra_max98090_dai.cpus->of_node = of_parse_phandle(np,
@@ -238,40 +237,31 @@ static int tegra_max98090_probe(struct platform_device *pdev) 
	if (!tegra_max98090_dai.cpus->of_node) {

		dev_err(&pdev->dev,

			"Property 'nvidia,i2s-controller' missing or invalid\n");

		ret = -EINVAL;

		goto err;

		return -EINVAL;

	}



	tegra_max98090_dai.platforms->of_node = tegra_max98090_dai.cpus->of_node;



	ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);

	if (ret)

		goto err;

		return ret;



	ret = snd_soc_register_card(card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",

			ret);

		goto err_fini_utils;

		return ret;

	}



	return 0;



err_fini_utils:

	tegra_asoc_utils_fini(&machine->util_data);

err:

	return ret;

}



static int tegra_max98090_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);



	snd_soc_unregister_card(card);



	tegra_asoc_utils_fini(&machine->util_data);



	return 0;

}

sound/soc/tegra/tegra_rt5640.c

+6 −16
Original line number Diff line number Diff line
@@ -164,19 +164,18 @@ static int tegra_rt5640_probe(struct platform_device *pdev) 


	ret = snd_soc_of_parse_card_name(card, "nvidia,model");

	if (ret)

		goto err;

		return ret;



	ret = snd_soc_of_parse_audio_routing(card, "nvidia,audio-routing");

	if (ret)

		goto err;

		return ret;



	tegra_rt5640_dai.codecs->of_node = of_parse_phandle(np,

			"nvidia,audio-codec", 0);

	if (!tegra_rt5640_dai.codecs->of_node) {

		dev_err(&pdev->dev,

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

		ret = -EINVAL;

		goto err;

		return -EINVAL;

	}



	tegra_rt5640_dai.cpus->of_node = of_parse_phandle(np,
@@ -184,40 +183,31 @@ static int tegra_rt5640_probe(struct platform_device *pdev) 
	if (!tegra_rt5640_dai.cpus->of_node) {

		dev_err(&pdev->dev,

			"Property 'nvidia,i2s-controller' missing or invalid\n");

		ret = -EINVAL;

		goto err;

		return -EINVAL;

	}



	tegra_rt5640_dai.platforms->of_node = tegra_rt5640_dai.cpus->of_node;



	ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);

	if (ret)

		goto err;

		return ret;



	ret = snd_soc_register_card(card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",

			ret);

		goto err_fini_utils;

		return ret;

	}



	return 0;



err_fini_utils:

	tegra_asoc_utils_fini(&machine->util_data);

err:

	return ret;

}



static int tegra_rt5640_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);



	snd_soc_unregister_card(card);



	tegra_asoc_utils_fini(&machine->util_data);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE