]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: zd1211rw: use 'time_left' variable with wait_for_completion_timeout()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 3 Jun 2024 09:15:39 +0000 (11:15 +0200)
committerKalle Valo <kvalo@kernel.org>
Wed, 12 Jun 2024 12:01:09 +0000 (15:01 +0300)
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>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240603091541.8367-7-wsa+renesas@sang-engineering.com
drivers/net/wireless/zydas/zd1211rw/zd_usb.c

index f3b567a13ded2a16a63d8fde83c1b6d1c685a3eb..2ee4218da1c522e420ad82d9ccef9f2f337b184c 100644 (file)
@@ -1698,7 +1698,7 @@ int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,
        int r, i, req_len, actual_req_len, try_count = 0;
        struct usb_device *udev;
        struct usb_req_read_regs *req = NULL;
-       unsigned long timeout;
+       unsigned long time_left;
        bool retry = false;
 
        if (count < 1) {
@@ -1748,9 +1748,9 @@ retry_read:
                goto error;
        }
 
-       timeout = wait_for_completion_timeout(&usb->intr.read_regs.completion,
-                                             msecs_to_jiffies(50));
-       if (!timeout) {
+       time_left = wait_for_completion_timeout(&usb->intr.read_regs.completion,
+                                               msecs_to_jiffies(50));
+       if (!time_left) {
                disable_read_regs_int(usb);
                dev_dbg_f(zd_usb_dev(usb), "read timed out\n");
                r = -ETIMEDOUT;