diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-04-23 11:48:34 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@linux-watchdog.org> | 2019-05-05 21:10:34 +0200 |
commit | 3b02dceec2126200838fbbab1fad0f81e76f1c89 (patch) | |
tree | f56f8a94a8c415c56e3cc3a9d14282cb33a4972d | |
parent | 73027cb8e8390c8b19e5925d621b74066ccab215 (diff) | |
download | linux-stable-3b02dceec2126200838fbbab1fad0f81e76f1c89.tar.gz linux-stable-3b02dceec2126200838fbbab1fad0f81e76f1c89.tar.bz2 linux-stable-3b02dceec2126200838fbbab1fad0f81e76f1c89.zip |
watchdog: intel_scu: make it explicitly non-modular
The Kconfig currently controlling compilation of this code is:
config INTEL_SCU_WATCHDOG
bool "Intel SCU Watchdog for Mobile Platforms"
...meaning that it currently is not being built as a module by anyone.
Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.
We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.
We leave the moduleparam.h include since the file does declare some
module parameters, and leaving them as such is currently the easiest
way to remain compatible with existing boot arg use cases.
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
-rw-r--r-- | drivers/watchdog/intel_scu_watchdog.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/watchdog/intel_scu_watchdog.c b/drivers/watchdog/intel_scu_watchdog.c index 718f7db35bec..94dbcc1d3c2b 100644 --- a/drivers/watchdog/intel_scu_watchdog.c +++ b/drivers/watchdog/intel_scu_watchdog.c @@ -25,7 +25,6 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/compiler.h> -#include <linux/module.h> #include <linux/kernel.h> #include <linux/moduleparam.h> #include <linux/types.h> @@ -545,21 +544,4 @@ register_reboot_error: iounmap(watchdog_device.timer_load_count_addr); return ret; } - -static void __exit intel_scu_watchdog_exit(void) -{ - - misc_deregister(&watchdog_device.miscdev); - unregister_reboot_notifier(&watchdog_device.intel_scu_notifier); - /* disable the timer */ - iowrite32(0x00000002, watchdog_device.timer_control_addr); - iounmap(watchdog_device.timer_load_count_addr); -} - late_initcall(intel_scu_watchdog_init); -module_exit(intel_scu_watchdog_exit); - -MODULE_AUTHOR("Intel Corporation"); -MODULE_DESCRIPTION("Intel SCU Watchdog Device Driver"); -MODULE_LICENSE("GPL"); -MODULE_VERSION(WDT_VER); |