Unverified Commit cfcd957e authored by Wolfram Sang's avatar Wolfram Sang Committed by Mark Brown
Browse files

ASoC: codecs: wm8962: use 'time_left' variable with wait_for_completion_timeout() 



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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20240430115438.29134-2-wsa+renesas@sang-engineering.com


Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ba2a2c37

sound/soc/codecs/wm8962.c

+6 −6
Original line number Diff line number Diff line
@@ -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);