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

ASoC: codecs: wm8993: 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.

Fix to the proper variable type 'unsigned long' while here.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20240430115438.29134-3-wsa+renesas@sang-engineering.com


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

sound/soc/codecs/wm8993.c

+6 −6
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int _wm8993_set_fll(struct snd_soc_component *component, int fll_id, int 
	struct i2c_client *i2c = to_i2c_client(component->dev);

	u16 reg1, reg4, reg5;

	struct _fll_div fll_div;

	unsigned int timeout;

	unsigned long time_left;

	int ret;



	/* Any change? */
@@ -543,19 +543,19 @@ static int _wm8993_set_fll(struct snd_soc_component *component, int fll_id, int 


	/* If we've got an interrupt wired up make sure we get it */

	if (i2c->irq)

		timeout = msecs_to_jiffies(20);

		time_left = msecs_to_jiffies(20);

	else if (Fref < 1000000)

		timeout = msecs_to_jiffies(3);

		time_left = msecs_to_jiffies(3);

	else

		timeout = msecs_to_jiffies(1);

		time_left = msecs_to_jiffies(1);



	try_wait_for_completion(&wm8993->fll_lock);



	/* Enable the FLL */

	snd_soc_component_write(component, WM8993_FLL_CONTROL_1, reg1 | WM8993_FLL_ENA);



	timeout = wait_for_completion_timeout(&wm8993->fll_lock, timeout);

	if (i2c->irq && !timeout)

	time_left = wait_for_completion_timeout(&wm8993->fll_lock, time_left);

	if (i2c->irq && !time_left)

		dev_warn(component->dev, "Timed out waiting for FLL\n");



	dev_dbg(component->dev, "FLL enabled at %dHz->%dHz\n", Fref, Fout);