]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: brcmfmac: use 'time_left' variable with wait_event_timeout()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 3 Jun 2024 09:15:35 +0000 (11:15 +0200)
committerKalle Valo <kvalo@kernel.org>
Wed, 12 Jun 2024 12:01:08 +0000 (15:01 +0300)
There is a confusing pattern in the kernel to use a variable named 'timeout' to
store the result of wait_event_timeout() causing patterns like:

timeout = wait_event_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 'long' while here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240603091541.8367-3-wsa+renesas@sang-engineering.com
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

index 5fe0e671ecb36d8da08f66d280c3c071892e432c..1585a5653ee4b9435fb4490281ecfe0b57395aaa 100644 (file)
@@ -4071,7 +4071,7 @@ static void brcmf_report_wowl_wakeind(struct wiphy *wiphy, struct brcmf_if *ifp)
        struct cfg80211_wowlan_wakeup *wakeup;
        u32 wakeind;
        s32 err;
-       int timeout;
+       long time_left;
 
        err = brcmf_fil_iovar_data_get(ifp, "wowl_wakeind", &wake_ind_le,
                                       sizeof(wake_ind_le));
@@ -4113,10 +4113,10 @@ static void brcmf_report_wowl_wakeind(struct wiphy *wiphy, struct brcmf_if *ifp)
                }
                if (wakeind & BRCMF_WOWL_PFN_FOUND) {
                        brcmf_dbg(INFO, "WOWL Wake indicator: BRCMF_WOWL_PFN_FOUND\n");
-                       timeout = wait_event_timeout(cfg->wowl.nd_data_wait,
-                               cfg->wowl.nd_data_completed,
-                               BRCMF_ND_INFO_TIMEOUT);
-                       if (!timeout)
+                       time_left = wait_event_timeout(cfg->wowl.nd_data_wait,
+                                                      cfg->wowl.nd_data_completed,
+                                                      BRCMF_ND_INFO_TIMEOUT);
+                       if (!time_left)
                                bphy_err(drvr, "No result for wowl net detect\n");
                        else
                                wakeup_data.net_detect = cfg->wowl.nd_info;