aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-04-23 11:48:34 -0400
committerWim Van Sebroeck <wim@linux-watchdog.org>2019-05-05 15:10:34 -0400
commit3b02dceec2126200838fbbab1fad0f81e76f1c89 (patch)
treef56f8a94a8c415c56e3cc3a9d14282cb33a4972d
parent73027cb8e8390c8b19e5925d621b74066ccab215 (diff)
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.c18
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 @@
25#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 25#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
26 26
27#include <linux/compiler.h> 27#include <linux/compiler.h>
28#include <linux/module.h>
29#include <linux/kernel.h> 28#include <linux/kernel.h>
30#include <linux/moduleparam.h> 29#include <linux/moduleparam.h>
31#include <linux/types.h> 30#include <linux/types.h>
@@ -545,21 +544,4 @@ register_reboot_error:
545 iounmap(watchdog_device.timer_load_count_addr); 544 iounmap(watchdog_device.timer_load_count_addr);
546 return ret; 545 return ret;
547} 546}
548
549static void __exit intel_scu_watchdog_exit(void)
550{
551
552 misc_deregister(&watchdog_device.miscdev);
553 unregister_reboot_notifier(&watchdog_device.intel_scu_notifier);
554 /* disable the timer */
555 iowrite32(0x00000002, watchdog_device.timer_control_addr);
556 iounmap(watchdog_device.timer_load_count_addr);
557}
558
559late_initcall(intel_scu_watchdog_init); 547late_initcall(intel_scu_watchdog_init);
560module_exit(intel_scu_watchdog_exit);
561
562MODULE_AUTHOR("Intel Corporation");
563MODULE_DESCRIPTION("Intel SCU Watchdog Device Driver");
564MODULE_LICENSE("GPL");
565MODULE_VERSION(WDT_VER);