Unverified Commit e2cb72d2 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: codecs: da7213: Simplify mclk initialization 



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.

Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://msgid.link/r/20240221152516.852353-2-cezary.rojewski@intel.com


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

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);