Re: [PATCH] watchdog: dw: use devm_watchdog_register_device()

From: Guenter Roeck
Date: Fri Jan 25 2019 - 03:04:31 EST


Hi,

On 1/24/19 11:52 PM, Jisheng Zhang wrote:
Use devm_watchdog_register_device() to simplify the code.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@xxxxxxxxxxxxx>
---
drivers/watchdog/dw_wdt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 501aebb5b81f..c053c2de5c2f 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -303,7 +303,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
watchdog_set_restart_priority(wdd, 128);
- ret = watchdog_register_device(wdd);
+ ret = devm_watchdog_register_device(wdd);
if (ret)
goto out_disable_clk;
@@ -318,7 +318,6 @@ static int dw_wdt_drv_remove(struct platform_device *pdev)
{
struct dw_wdt *dw_wdt = platform_get_drvdata(pdev);
- watchdog_unregister_device(&dw_wdt->wdd);
reset_control_assert(dw_wdt->rst);
clk_disable_unprepare(dw_wdt->clk);

Unfortunately it isn't that easy. The other two calls have to be executed after
unregistering the watchdog, meaning you would have to add devm_add_action()
in the probe function to call them.

Guenter