summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/softdog.c
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2016-05-25 02:37:49 -0400
committerWim Van Sebroeck <wim@iguana.be>2016-07-17 14:54:52 -0400
commit4a23e2bf032fdceecef1ab314c7f84d9c2050490 (patch)
treeb65df370b59960e8add1ed81456468c091b010a3 /drivers/watchdog/softdog.c
parent61a21274c9eee5a3adb85441a91a071de4260863 (diff)
watchdog: softdog: improve coding style
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>
Diffstat (limited to 'drivers/watchdog/softdog.c')
-rw-r--r--drivers/watchdog/softdog.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index 5e3a30b99d44..b067edf246df 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -57,9 +57,9 @@ MODULE_PARM_DESC(soft_panic,
57static void softdog_fire(unsigned long data) 57static void softdog_fire(unsigned long data)
58{ 58{
59 module_put(THIS_MODULE); 59 module_put(THIS_MODULE);
60 if (soft_noboot) 60 if (soft_noboot) {
61 pr_crit("Triggered - Reboot ignored\n"); 61 pr_crit("Triggered - Reboot ignored\n");
62 else if (soft_panic) { 62 } else if (soft_panic) {
63 pr_crit("Initiating panic\n"); 63 pr_crit("Initiating panic\n");
64 panic("Software Watchdog Timer expired"); 64 panic("Software Watchdog Timer expired");
65 } else { 65 } else {
@@ -74,7 +74,7 @@ static struct timer_list softdog_ticktock =
74 74
75static int softdog_ping(struct watchdog_device *w) 75static int softdog_ping(struct watchdog_device *w)
76{ 76{
77 if (!mod_timer(&softdog_ticktock, jiffies+(w->timeout*HZ))) 77 if (!mod_timer(&softdog_ticktock, jiffies + (w->timeout * HZ)))
78 __module_get(THIS_MODULE); 78 __module_get(THIS_MODULE);
79 return 0; 79 return 0;
80} 80}