Re: [PATCH 08/34] watchdog: bcm47xx: Convert to platform remove callback returning void

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 3/3/23 13:36, Uwe Kleine-König wrote:
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 (mostly) ignored
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.

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@xxxxxxxxxxxxxx>
---
  drivers/watchdog/bcm47xx_wdt.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index 05425c1dfd4c..841ca1839f7f 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -218,13 +218,11 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev)
  	return ret;
  }
-static int bcm47xx_wdt_remove(struct platform_device *pdev)
+static void bcm47xx_wdt_remove(struct platform_device *pdev)
  {
  	struct bcm47xx_wdt *wdt = dev_get_platdata(&pdev->dev);
watchdog_unregister_device(&wdt->wdd);
-
-	return 0;
  }
static struct platform_driver bcm47xx_wdt_driver = {
@@ -232,7 +230,7 @@ static struct platform_driver bcm47xx_wdt_driver = {
  		.name	= "bcm47xx-wdt",
  	},
  	.probe		= bcm47xx_wdt_probe,
-	.remove		= bcm47xx_wdt_remove,
+	.remove_new	= bcm47xx_wdt_remove,

Much better would be to call devm_watchdog_register_device() instead of
watchdog_register_device() and drop the remove function entirely.

Guenter




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux