p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

watchdog: softdog: consistently use softdog_ prefix 

And move module_init/exit to the proper place while here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.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@iguana.be>
This commit is contained in:
Wolfram Sang 2016-05-25 08:37:45 +02:00 committed by Wim Van Sebroeck
parent e8cf96abba
commit 0efc70b823
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/watchdog/softdog.c
View File

@ -54,12 +54,12 @@ module_param(soft_panic, int, 0);
MODULE_PARM_DESC(soft_panic,
"Softdog action, set to 1 to panic, 0 to reboot (default=0)");
static void watchdog_fire(unsigned long);
static void softdog_fire(unsigned long);
static struct timer_list watchdog_ticktock =
TIMER_INITIALIZER(watchdog_fire, 0, 0);
static struct timer_list softdog_ticktock =
TIMER_INITIALIZER(softdog_fire, 0, 0);
static void watchdog_fire(unsigned long data)
static void softdog_fire(unsigned long data)
{
module_put(THIS_MODULE);
if (soft_noboot)
@ -76,14 +76,14 @@ static void watchdog_fire(unsigned long data)
static int softdog_ping(struct watchdog_device *w)
{
if (!mod_timer(&watchdog_ticktock, jiffies+(w->timeout*HZ)))
if (!mod_timer(&softdog_ticktock, jiffies+(w->timeout*HZ)))
__module_get(THIS_MODULE);
return 0;
}
static int softdog_stop(struct watchdog_device *w)
{
if (del_timer(&watchdog_ticktock))
if (del_timer(&softdog_ticktock))
module_put(THIS_MODULE);
return 0;
@ -115,7 +115,7 @@ static struct watchdog_device softdog_dev = {
.timeout = TIMER_MARGIN,
};
static int __init watchdog_init(void)
static int __init softdog_init(void)
{
int ret;
@ -132,14 +132,13 @@ static int __init watchdog_init(void)
return 0;
}
module_init(softdog_init);
static void __exit watchdog_exit(void)
static void __exit softdog_exit(void)
{
watchdog_unregister_device(&softdog_dev);
}
module_init(watchdog_init);
module_exit(watchdog_exit);
module_exit(softdog_exit);
MODULE_AUTHOR("Alan Cox");
MODULE_DESCRIPTION("Software Watchdog Device Driver");