summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/watchdog_core.h
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-12-25 16:01:40 -0800
committerWim Van Sebroeck <wim@iguana.be>2015-12-29 20:36:01 +0100
commit32ecc6392654a0db34b310e8924b5b2c3b8bf503 (patch)
treeaeaeef6cab16c422f140ae7887c84a34231dbe51 /drivers/watchdog/watchdog_core.h
parent0933b453f1c7104d873aacf8524f8ac380a7ed08 (diff)
downloadlinux-0-day-32ecc6392654a0db34b310e8924b5b2c3b8bf503.tar.gz
linux-0-day-32ecc6392654a0db34b310e8924b5b2c3b8bf503.tar.xz
watchdog: Create watchdog device in watchdog_dev.c
The watchdog character device is currently created in watchdog_dev.c, and the watchdog device in watchdog_core.c. This results in cross-dependencies, since device creation needs to know the watchdog character device number as well as the watchdog class, both of which reside in watchdog_dev.c. Create the watchdog device in watchdog_dev.c to simplify the code. Inspired by earlier patch set from Damien Riegel. Cc: Damien Riegel <damien.riegel@savoirfairelinux.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/watchdog_core.h')
-rw-r--r--drivers/watchdog/watchdog_core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/watchdog_core.h b/drivers/watchdog/watchdog_core.h
index 1c8d6b0e68c77..86ff962d1e15d 100644
--- a/drivers/watchdog/watchdog_core.h
+++ b/drivers/watchdog/watchdog_core.h
@@ -32,6 +32,6 @@
* Functions/procedures to be called by the core
*/
extern int watchdog_dev_register(struct watchdog_device *);
-extern int watchdog_dev_unregister(struct watchdog_device *);
-extern struct class * __init watchdog_dev_init(void);
+extern void watchdog_dev_unregister(struct watchdog_device *);
+extern int __init watchdog_dev_init(void);
extern void __exit watchdog_dev_exit(void);