wifi: wfx: Remove some dead code
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Wed, 15 Feb 2023 12:34:37 +0000 (13:34 +0100)
committerKalle Valo <kvalo@kernel.org>
Wed, 22 Feb 2023 12:28:27 +0000 (14:28 +0200)
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
drivers/net/wireless/silabs/wfx/main.c

index 6b9864e..0b50f70 100644 (file)
@@ -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;
        }