ASoC: wm8962: Convert to devm_clk_get_optional()

Use the existing devm_clk_get_optional() helper instead of building a
similar construct on top of devm_clk_get() that fails to handle all
errors but -EPROBE_DEFER.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/c2a8a1a628804a4439732d02847e25c227083690.1634565564.git.geert+renesas@glider.be
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index ba16bdf9e478ca5f6dfe94d84579e862871d4621..a5584ba962dcf005214dad2bad4c95acdaf08e22 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3538,9 +3538,8 @@ static int wm8962_set_pdata_from_of(struct i2c_client *i2c,
                                pdata->gpio_init[i] = 0x0;
                }
 
-       pdata->mclk = devm_clk_get(&i2c->dev, NULL);
-
-       return 0;
+       pdata->mclk = devm_clk_get_optional(&i2c->dev, NULL);
+       return PTR_ERR_OR_ZERO(pdata->mclk);
 }
 
 static int wm8962_i2c_probe(struct i2c_client *i2c,
@@ -3572,14 +3571,6 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
                        return ret;
        }
 
-       /* Mark the mclk pointer to NULL if no mclk assigned */
-       if (IS_ERR(wm8962->pdata.mclk)) {
-               /* But do not ignore the request for probe defer */
-               if (PTR_ERR(wm8962->pdata.mclk) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-               wm8962->pdata.mclk = NULL;
-       }
-
        for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++)
                wm8962->supplies[i].supply = wm8962_supply_names[i];