ASoC: codecs: rt5616: 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: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://msgid.link/r/20240221152516.852353-5-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c
index c13108b51eaf6216ae09ef9f25fbd6a155a5d93c..e7aa60e73961c8b40cff1c672ed50ee7411ea976 100644 (file)
--- a/sound/soc/codecs/rt5616.c
+++ b/sound/soc/codecs/rt5616.c
@@ -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;