watchdog: pcwd: drop always-false if from remove callback
authorUwe Kleine-König <uwe@kleine-koenig.org>
Fri, 22 Jan 2021 09:24:47 +0000 (10:24 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 26 Jan 2021 06:38:54 +0000 (07:38 +0100)
If pcwd_isa_probe() succeeded pcwd_private.io_addr cannot be NULL. (And
if pcwd_isa_probe() failed, pcwd_isa_remove() isn't called.)

Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Link: https://lore.kernel.org/r/20210122092449.426097-2-uwe@kleine-koenig.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
drivers/watchdog/pcwd.c

index e86fa7f8351d8fc44cce2e30a81e2cafebbe0738..b95cd38f3ceb73cbd358da3f2da38de8e46f83dc 100644 (file)
@@ -956,9 +956,6 @@ static int pcwd_isa_remove(struct device *dev, unsigned int id)
        if (debug >= DEBUG)
                pr_debug("pcwd_isa_remove id=%d\n", id);
 
-       if (!pcwd_private.io_addr)
-               return 1;
-
        /*  Disable the board  */
        if (!nowayout)
                pcwd_stop();