ASoC: codecs: rt5514: 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-4-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c
index 43fc7814fddeb538968525a344ea78b2c3a20173..a8cdc3d6994d565f7470750a4622f2bb57290f6e 100644 (file)
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
@@ -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,