From: "Uwe Kleine-König" <uwe@kleine-koenig.org>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
William Breathitt Gray <vilhelm.gray@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 1/2] watchdog: pcwd: drop always-false if from remove callback
Date: Thu, 21 Jan 2021 21:48:11 +0100 [thread overview]
Message-ID: <20210121204812.402589-2-uwe@kleine-koenig.org> (raw)
In-Reply-To: <20210121204812.402589-1-uwe@kleine-koenig.org>
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(-)
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
next prev parent reply other threads:[~2021-01-21 21:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 20:48 [PATCH v1 0/2] isa: Make the remove callback for isa drivers return void Uwe Kleine-König
2021-01-21 20:48 ` Uwe Kleine-König [this message]
2021-01-21 23:08 ` [PATCH v1 1/2] watchdog: pcwd: drop always-false if from remove callback Guenter Roeck
2021-01-21 20:48 ` [PATCH v1 2/2] isa: Make the remove callback for isa drivers return void Uwe Kleine-König
2021-01-22 7:34 ` Marc Kleine-Budde
2021-01-22 8:53 ` Wolfram Sang
2021-01-22 9:01 ` Takashi Iwai
2021-01-22 1:03 ` [PATCH v1 0/2] " William Breathitt Gray
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210121204812.402589-2-uwe@kleine-koenig.org \
--to=uwe@kleine-koenig.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=vilhelm.gray@gmail.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).