]> www.infradead.org Git - users/hch/configfs.git/commitdiff
wifi: mwl8k: use 'time_left' variable with wait_for_completion_timeout()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 3 Jun 2024 09:15:36 +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_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-4-wsa+renesas@sang-engineering.com
drivers/net/wireless/marvell/mwl8k.c

index d3d07bb263352bf4963bf1edf3a55c494adb4d0b..241a02a0accd70ed64514bfb1b92841199d14281 100644 (file)
@@ -2211,7 +2211,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt_hdr *cmd
        dma_addr_t dma_addr;
        unsigned int dma_size;
        int rc;
-       unsigned long timeout = 0;
+       unsigned long time_left = 0;
        u8 buf[32];
        u32 bitmap = 0;
 
@@ -2258,8 +2258,8 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt_hdr *cmd
        iowrite32(MWL8K_H2A_INT_DUMMY,
                regs + MWL8K_HIU_H2A_INTERRUPT_EVENTS);
 
-       timeout = wait_for_completion_timeout(&cmd_wait,
-                               msecs_to_jiffies(MWL8K_CMD_TIMEOUT_MS));
+       time_left = wait_for_completion_timeout(&cmd_wait,
+                                               msecs_to_jiffies(MWL8K_CMD_TIMEOUT_MS));
 
        priv->hostcmd_wait = NULL;
 
@@ -2267,7 +2267,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt_hdr *cmd
        dma_unmap_single(&priv->pdev->dev, dma_addr, dma_size,
                         DMA_BIDIRECTIONAL);
 
-       if (!timeout) {
+       if (!time_left) {
                wiphy_err(hw->wiphy, "Command %s timeout after %u ms\n",
                          mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
                          MWL8K_CMD_TIMEOUT_MS);
@@ -2275,7 +2275,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt_hdr *cmd
        } else {
                int ms;
 
-               ms = MWL8K_CMD_TIMEOUT_MS - jiffies_to_msecs(timeout);
+               ms = MWL8K_CMD_TIMEOUT_MS - jiffies_to_msecs(time_left);
 
                rc = cmd->result ? -EINVAL : 0;
                if (rc)