summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/aspeed_wdt.c
diff options
context:
space:
mode:
authorWolfram Sang2019-05-18 23:27:18 +0200
committerWim Van Sebroeck2019-07-08 15:13:02 +0200
commit4ab054336109b743d851fe57fe51b8d61f1ff3e9 (patch)
tree46ec7f5a0d3965982e317da8847b2c09c4d68212 /drivers/watchdog/aspeed_wdt.c
parentwatchdog: let core print error message when registering device fails (diff)
downloadkernel-qcow2-linux-4ab054336109b743d851fe57fe51b8d61f1ff3e9.tar.gz
kernel-qcow2-linux-4ab054336109b743d851fe57fe51b8d61f1ff3e9.tar.xz
kernel-qcow2-linux-4ab054336109b743d851fe57fe51b8d61f1ff3e9.zip
watchdog: aspeed_wdt: drop warning after registering device
The core will print out details now. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers/watchdog/aspeed_wdt.c')
-rw-r--r--drivers/watchdog/aspeed_wdt.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index f0148637e5dd..cc71861e033a 100644
--- a/drivers/watchdog/aspeed_wdt.c
+++ b/drivers/watchdog/aspeed_wdt.c
@@ -309,13 +309,7 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY)
wdt->wdd.bootstatus = WDIOF_CARDRESET;
- ret = devm_watchdog_register_device(dev, &wdt->wdd);
- if (ret) {
- dev_err(dev, "failed to register\n");
- return ret;
- }
-
- return 0;
+ return devm_watchdog_register_device(dev, &wdt->wdd);
}
static struct platform_driver aspeed_watchdog_driver = {