diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2023-02-15 13:34:37 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2023-02-22 14:28:27 +0200 |
| commit | 015bf4df8ea67080668ac8314e692076dea1ce6d (patch) | |
| tree | c5d24bf1578486a4986b5ce0721c32d1d8ff07d9 /drivers/net | |
| parent | 59e6ded57cc1b3b5117cef66dabe6d7977208ba0 (diff) | |
wifi: wfx: Remove some dead code
wait_for_completion_timeout() can not return a <0 value.
So simplify the logic and remove dead code.
-ERESTARTSYS can not be returned by do_wait_for_common() for tasks with
TASK_UNINTERRUPTIBLE, which is the case for wait_for_completion_timeout()
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/809c4a645c8d1306c0d256345515865c40ec731c.1676464422.git.christophe.jaillet@wanadoo.fr
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/silabs/wfx/main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/silabs/wfx/main.c b/drivers/net/wireless/silabs/wfx/main.c index 6b9864e478ac..0b50f7058bbb 100644 --- a/drivers/net/wireless/silabs/wfx/main.c +++ b/drivers/net/wireless/silabs/wfx/main.c @@ -358,13 +358,9 @@ int wfx_probe(struct wfx_dev *wdev) wfx_bh_poll_irq(wdev); err = wait_for_completion_timeout(&wdev->firmware_ready, 1 * HZ); - if (err <= 0) { - if (err == 0) { - dev_err(wdev->dev, "timeout while waiting for startup indication\n"); - err = -ETIMEDOUT; - } else if (err == -ERESTARTSYS) { - dev_info(wdev->dev, "probe interrupted by user\n"); - } + if (err == 0) { + dev_err(wdev->dev, "timeout while waiting for startup indication\n"); + err = -ETIMEDOUT; goto bh_unregister; } |