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

Commit 46dccc35 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Mark Brown
Browse files

ASoC: qcom: lpass-cpu: Remove unnecessary clock checks 



Clean up the clock calling code by removing numerous IS_ERR() checks by
just assigning the clock NULL; as this turn all used functions in the
clk API to nops.

Also include the word "optional" in the error message when failing to acquire
the optional osr clocks.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74

sound/soc/qcom/lpass-cpu.c

+10 −17
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ static int lpass_cpu_daiops_set_sysclk(struct snd_soc_dai *dai, int clk_id, 
	struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);

	int ret;



	if (IS_ERR(drvdata->mi2s_osr_clk[dai->driver->id]))

		return 0;



	ret = clk_set_rate(drvdata->mi2s_osr_clk[dai->driver->id], freq);

	if (ret)

		dev_err(dai->dev, "%s() error setting mi2s osrclk to %u: %d\n",
@@ -50,23 +47,18 @@ static int lpass_cpu_daiops_startup(struct snd_pcm_substream *substream, 
	struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);

	int ret;



	if (!IS_ERR(drvdata->mi2s_osr_clk[dai->driver->id])) {

		ret = clk_prepare_enable(

				drvdata->mi2s_osr_clk[dai->driver->id]);

	ret = clk_prepare_enable(drvdata->mi2s_osr_clk[dai->driver->id]);

	if (ret) {

		dev_err(dai->dev, "%s() error in enabling mi2s osr clk: %d\n",

				__func__, ret);

		return ret;

	}

	}



	ret = clk_prepare_enable(drvdata->mi2s_bit_clk[dai->driver->id]);

	if (ret) {

		dev_err(dai->dev, "%s() error in enabling mi2s bit clk: %d\n",

				__func__, ret);

		if (!IS_ERR(drvdata->mi2s_osr_clk[dai->driver->id]))

			clk_disable_unprepare(

				drvdata->mi2s_osr_clk[dai->driver->id]);

		clk_disable_unprepare(drvdata->mi2s_osr_clk[dai->driver->id]);

		return ret;

	}
@@ -80,7 +72,6 @@ static void lpass_cpu_daiops_shutdown(struct snd_pcm_substream *substream, 


	clk_disable_unprepare(drvdata->mi2s_bit_clk[dai->driver->id]);



	if (!IS_ERR(drvdata->mi2s_osr_clk[dai->driver->id]))

	clk_disable_unprepare(drvdata->mi2s_osr_clk[dai->driver->id]);

}
@@ -505,9 +496,11 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 
								clk_name);

		if (IS_ERR(drvdata->mi2s_osr_clk[dai_id])) {

			dev_warn(&pdev->dev,

				"%s() error getting mi2s-osr-clk: %ld\n",

				"%s() error getting optional mi2s-osr-clk: %ld\n",

				__func__,

				PTR_ERR(drvdata->mi2s_osr_clk[dai_id]));



			drvdata->mi2s_osr_clk[dai_id] = NULL;

		}



		if (variant->num_dai > 1)