Unverified Commit 306904db authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: codecs: Simplify mclk initialization 

Merge series from Cezary Rojewski <cezary.rojewski@intel.com>:

The patchset may not cover all codecs found in the codecs/ directory -
noticed a possible improvement and grepped for similar pattern across C
files found in the directory. Those addressed here seem pretty
straightforward.

Most of clk_xxx() functions do check if provided clk-pointer is
non-NULL. These do not check if the pointer is an error-pointer.
Providing such to a clk_xxx() results in a panic.

By utilizing _optional() variant of devm_clk_get() the driver code is
both simplified and more robust. There is no need to remember about
IS_ERR(clk) checks each time mclk is accessed.
parents d34f0c8e bf900c85

sound/soc/codecs/da7213.c

+4 −8
Original line number Diff line number Diff line
@@ -2101,18 +2101,14 @@ static int da7213_probe(struct snd_soc_component *component) 
	pm_runtime_put_sync(component->dev);



	/* Check if MCLK provided */

	da7213->mclk = devm_clk_get(component->dev, "mclk");

	if (IS_ERR(da7213->mclk)) {

		if (PTR_ERR(da7213->mclk) != -ENOENT)

	da7213->mclk = devm_clk_get_optional(component->dev, "mclk");

	if (IS_ERR(da7213->mclk))

		return PTR_ERR(da7213->mclk);

		else

			da7213->mclk = NULL;

	} else {

	if (da7213->mclk)

		/* Do automatic PLL handling assuming fixed clock until

		 * set_pll() has been called. This makes the codec usable

		 * with the simple-audio-card driver. */

		da7213->fixed_clk_auto_pll = true;

	}



	/* Default infinite tone gen, start/stop by Kcontrol */

	snd_soc_component_write(component, DA7213_TONE_GEN_CYCLES, DA7213_BEEP_CYCLES_MASK);

sound/soc/codecs/nau8825.c

+4 −8
Original line number Diff line number Diff line
@@ -2836,16 +2836,12 @@ static int nau8825_read_device_properties(struct device *dev, 
	if (nau8825->adc_delay < 125 || nau8825->adc_delay > 500)

		dev_warn(dev, "Please set the suitable delay time!\n");



	nau8825->mclk = devm_clk_get(dev, "mclk");

	if (PTR_ERR(nau8825->mclk) == -EPROBE_DEFER) {

		return -EPROBE_DEFER;

	} else if (PTR_ERR(nau8825->mclk) == -ENOENT) {

	nau8825->mclk = devm_clk_get_optional(dev, "mclk");

	if (IS_ERR(nau8825->mclk))

		return PTR_ERR(nau8825->mclk);

	if (!nau8825->mclk)

		/* The MCLK is managed externally or not used at all */

		nau8825->mclk = NULL;

		dev_info(dev, "No 'mclk' clock found, assume MCLK is managed externally");

	} else if (IS_ERR(nau8825->mclk)) {

		return -EINVAL;

	}



	return 0;

}

sound/soc/codecs/rt5514.c

+3 −6
Original line number Diff line number Diff line
@@ -1054,9 +1054,6 @@ static int rt5514_set_bias_level(struct snd_soc_component *component, 


	switch (level) {

	case SND_SOC_BIAS_PREPARE:

		if (IS_ERR(rt5514->mclk))

			break;



		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {

			clk_disable_unprepare(rt5514->mclk);

		} else {
@@ -1097,9 +1094,9 @@ static int rt5514_probe(struct snd_soc_component *component) 
	struct platform_device *pdev = container_of(component->dev,

						   struct platform_device, dev);



	rt5514->mclk = devm_clk_get(component->dev, "mclk");

	if (PTR_ERR(rt5514->mclk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;

	rt5514->mclk = devm_clk_get_optional(component->dev, "mclk");

	if (IS_ERR(rt5514->mclk))

		return PTR_ERR(rt5514->mclk);



	if (rt5514->pdata.dsp_calib_clk_name) {

		rt5514->dsp_calib_clk = devm_clk_get(&pdev->dev,

sound/soc/codecs/rt5616.c

+3 −6
Original line number Diff line number Diff line
@@ -1174,9 +1174,6 @@ static int rt5616_set_bias_level(struct snd_soc_component *component, 
		 * away from ON. Disable the clock in that case, otherwise

		 * enable it.

		 */

		if (IS_ERR(rt5616->mclk))

			break;



		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {

			clk_disable_unprepare(rt5616->mclk);

		} else {
@@ -1225,9 +1222,9 @@ static int rt5616_probe(struct snd_soc_component *component) 
	struct rt5616_priv *rt5616 = snd_soc_component_get_drvdata(component);



	/* Check if MCLK provided */

	rt5616->mclk = devm_clk_get(component->dev, "mclk");

	if (PTR_ERR(rt5616->mclk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;

	rt5616->mclk = devm_clk_get_optional(component->dev, "mclk");

	if (IS_ERR(rt5616->mclk))

		return PTR_ERR(rt5616->mclk);



	rt5616->component = component;

sound/soc/codecs/rt5640.c

+3 −6
Original line number Diff line number Diff line
@@ -1949,9 +1949,6 @@ static int rt5640_set_bias_level(struct snd_soc_component *component, 
		 * away from ON. Disable the clock in that case, otherwise

		 * enable it.

		 */

		if (IS_ERR(rt5640->mclk))

			break;



		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {

			clk_disable_unprepare(rt5640->mclk);

		} else {
@@ -2661,9 +2658,9 @@ static int rt5640_probe(struct snd_soc_component *component) 
	u32 val;



	/* Check if MCLK provided */

	rt5640->mclk = devm_clk_get(component->dev, "mclk");

	if (PTR_ERR(rt5640->mclk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;

	rt5640->mclk = devm_clk_get_optional(component->dev, "mclk");

	if (IS_ERR(rt5640->mclk))

		return PTR_ERR(rt5640->mclk);



	rt5640->component = component;