tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ALSA: aoa: soundbus: i2sbus: pcm: 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: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20240430121028.30443-1-wsa+renesas@sang-engineering.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Wolfram Sang and committed by
Takashi Iwai 222a5966 44f69ddc

+5 -5
+5 -5
sound/aoa/soundbus/i2sbus/pcm.c
··· 255 255 { 256 256 unsigned long flags; 257 257 DECLARE_COMPLETION_ONSTACK(done); 258 - long timeout; 258 + unsigned long time_left; 259 259 260 260 spin_lock_irqsave(&i2sdev->low_lock, flags); 261 261 if (pi->dbdma_ring.stopping) { 262 262 pi->stop_completion = &done; 263 263 spin_unlock_irqrestore(&i2sdev->low_lock, flags); 264 - timeout = wait_for_completion_timeout(&done, HZ); 264 + time_left = wait_for_completion_timeout(&done, HZ); 265 265 spin_lock_irqsave(&i2sdev->low_lock, flags); 266 266 pi->stop_completion = NULL; 267 - if (timeout == 0) { 267 + if (time_left == 0) { 268 268 /* timeout expired, stop dbdma forcefully */ 269 269 printk(KERN_ERR "i2sbus_wait_for_stop: timed out\n"); 270 270 /* make sure RUN, PAUSE and S0 bits are cleared */ 271 271 out_le32(&pi->dbdma->control, (RUN | PAUSE | 1) << 16); 272 272 pi->dbdma_ring.stopping = 0; 273 - timeout = 10; 273 + time_left = 10; 274 274 while (in_le32(&pi->dbdma->status) & ACTIVE) { 275 - if (--timeout <= 0) 275 + if (--time_left <= 0) 276 276 break; 277 277 udelay(1); 278 278 }