From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org, kernel@pengutronix.de
Subject: [PATCH 5/5] watchdog: txx9wdt: Convert to platform remove callback returning void
Date: Mon, 6 Nov 2023 16:48:13 +0100 [thread overview]
Message-ID: <20231106154807.3866712-6-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20231106154807.3866712-1-u.kleine-koenig@pengutronix.de>
The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code. However the value returned is ignored (apart
from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return
void. In the first step of this quest all drivers are converted to
.remove_new(), which already returns void. Eventually after all drivers
are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove
callback to the void returning variant.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/watchdog/txx9wdt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index f900c519ed63..8d5f67acbff2 100644
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -145,12 +145,11 @@ static int txx9wdt_probe(struct platform_device *dev)
return ret;
}
-static int txx9wdt_remove(struct platform_device *dev)
+static void txx9wdt_remove(struct platform_device *dev)
{
watchdog_unregister_device(&txx9wdt);
clk_disable_unprepare(txx9_imclk);
clk_put(txx9_imclk);
- return 0;
}
static void txx9wdt_shutdown(struct platform_device *dev)
@@ -160,7 +159,7 @@ static void txx9wdt_shutdown(struct platform_device *dev)
static struct platform_driver txx9wdt_driver = {
.probe = txx9wdt_probe,
- .remove = txx9wdt_remove,
+ .remove_new = txx9wdt_remove,
.shutdown = txx9wdt_shutdown,
.driver = {
.name = "txx9wdt",
--
2.42.0
next prev parent reply other threads:[~2023-11-06 15:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 15:48 [PATCH 0/5] watchdog: Drop platform_driver_probe() and convert to platform remove callback returning void (part II) Uwe Kleine-König
2023-11-06 15:48 ` [PATCH 1/5] watchdog: at91sam9: Stop using module_platform_driver_probe() Uwe Kleine-König
2023-11-06 16:01 ` Guenter Roeck
2023-11-07 9:19 ` Nicolas Ferre
2023-11-06 15:48 ` [PATCH 2/5] watchdog: txx9: " Uwe Kleine-König
2023-11-06 16:02 ` Guenter Roeck
2023-11-06 15:48 ` [PATCH 3/5] watchdog: at91sam9_wdt: Convert to platform remove callback returning void Uwe Kleine-König
2023-11-06 16:02 ` Guenter Roeck
2023-11-07 9:20 ` Nicolas Ferre
2023-11-06 15:48 ` [PATCH 4/5] watchdog: starfive-wdt: " Uwe Kleine-König
2023-11-06 16:02 ` Guenter Roeck
2023-11-06 15:48 ` Uwe Kleine-König [this message]
2023-11-06 16:02 ` [PATCH 5/5] watchdog: txx9wdt: " Guenter Roeck
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=20231106154807.3866712-6-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=kernel@pengutronix.de \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).