| Message ID | 20210121204812.402589-2-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | isa: Make the remove callback for isa drivers return void | expand |
On Thu, Jan 21, 2021 at 09:48:11PM +0100, Uwe Kleine-König wrote: > If pcwd_isa_probe() succeeded pcwd_private.io_addr cannot be NULL. (And > if pcwd_isa_probe() failed, pcwd_isa_remove() isn't called.) > > Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/pcwd.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c > index e86fa7f8351d..b95cd38f3ceb 100644 > --- a/drivers/watchdog/pcwd.c > +++ b/drivers/watchdog/pcwd.c > @@ -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(); > -- > 2.29.2 >
diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c index e86fa7f8351d..b95cd38f3ceb 100644 --- a/drivers/watchdog/pcwd.c +++ b/drivers/watchdog/pcwd.c @@ -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();
If pcwd_isa_probe() succeeded pcwd_private.io_addr cannot be NULL. (And if pcwd_isa_probe() failed, pcwd_isa_remove() isn't called.) Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> --- drivers/watchdog/pcwd.c | 3 --- 1 file changed, 3 deletions(-)