Commit 7db1634d authored by Guenter Roeck's avatar Guenter Roeck

watchdog: aspeed_wdt: Convert to use device managed functions

Use device managed functions to simplify error handling, reduce
source code size, improve readability, and reduce the likelyhood of bugs.

The conversion was done automatically with coccinelle using the
following semantic patches. The semantic patches and the scripts used
to generate this commit log are available at
https://github.com/groeck/coccinelle-patches

- Drop assignments to otherwise unused variables
- Drop remove function
- Drop platform_set_drvdata()
- Use devm_watchdog_register_driver() to register watchdog device
Acked-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 9e143758
...@@ -136,15 +136,6 @@ static const struct watchdog_info aspeed_wdt_info = { ...@@ -136,15 +136,6 @@ static const struct watchdog_info aspeed_wdt_info = {
.identity = KBUILD_MODNAME, .identity = KBUILD_MODNAME,
}; };
static int aspeed_wdt_remove(struct platform_device *pdev)
{
struct aspeed_wdt *wdt = platform_get_drvdata(pdev);
watchdog_unregister_device(&wdt->wdd);
return 0;
}
static int aspeed_wdt_probe(struct platform_device *pdev) static int aspeed_wdt_probe(struct platform_device *pdev)
{ {
struct aspeed_wdt *wdt; struct aspeed_wdt *wdt;
...@@ -187,20 +178,17 @@ static int aspeed_wdt_probe(struct platform_device *pdev) ...@@ -187,20 +178,17 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
set_bit(WDOG_HW_RUNNING, &wdt->wdd.status); set_bit(WDOG_HW_RUNNING, &wdt->wdd.status);
} }
ret = watchdog_register_device(&wdt->wdd); ret = devm_watchdog_register_device(&pdev->dev, &wdt->wdd);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register\n"); dev_err(&pdev->dev, "failed to register\n");
return ret; return ret;
} }
platform_set_drvdata(pdev, wdt);
return 0; return 0;
} }
static struct platform_driver aspeed_watchdog_driver = { static struct platform_driver aspeed_watchdog_driver = {
.probe = aspeed_wdt_probe, .probe = aspeed_wdt_probe,
.remove = aspeed_wdt_remove,
.driver = { .driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.of_match_table = of_match_ptr(aspeed_wdt_of_table), .of_match_table = of_match_ptr(aspeed_wdt_of_table),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment