ASoC: codecs: wm8962: use 'time_left' variable with wait_for_completion_timeout()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Tue, 30 Apr 2024 11:54:34 +0000 (13:54 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 6 May 2024 15:00:14 +0000 (00:00 +0900)
There is a confusing pattern in the kernel to use a variable named 'timeout' to
store the result of wait_for_completion_timeout() causing patterns like:

timeout = wait_for_completion_timeout(...)
if (!timeout) return -ETIMEDOUT;

with all kinds of permutations. Use 'time_left' as a variable to make the code
self explaining.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20240430115438.29134-2-wsa+renesas@sang-engineering.com
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm8962.c

index 3ef95b7dcbdb96facfe02abee62c6af81b760778..08d164ce3e49cb64837efa54795d265f2aa3ccdc 100644 (file)
@@ -2886,7 +2886,7 @@ static int wm8962_set_fll(struct snd_soc_component *component, int fll_id, int s
 {
        struct wm8962_priv *wm8962 = snd_soc_component_get_drvdata(component);
        struct _fll_div fll_div;
-       unsigned long timeout;
+       unsigned long time_left;
        int ret;
        int fll1 = 0;
 
@@ -2974,14 +2974,14 @@ static int wm8962_set_fll(struct snd_soc_component *component, int fll_id, int s
         * higher if we'll error out
         */
        if (wm8962->irq)
-               timeout = msecs_to_jiffies(5);
+               time_left = msecs_to_jiffies(5);
        else
-               timeout = msecs_to_jiffies(1);
+               time_left = msecs_to_jiffies(1);
 
-       timeout = wait_for_completion_timeout(&wm8962->fll_lock,
-                                             timeout);
+       time_left = wait_for_completion_timeout(&wm8962->fll_lock,
+                                               time_left);
 
-       if (timeout == 0 && wm8962->irq) {
+       if (time_left == 0 && wm8962->irq) {
                dev_err(component->dev, "FLL lock timed out");
                snd_soc_component_update_bits(component, WM8962_FLL_CONTROL_1,
                                    WM8962_FLL_ENA, 0);