diff options
author | Corey Minyard <minyard@acm.org> | 2006-03-31 05:30:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:18:54 -0500 |
commit | 8a3628d53fe5eb1d1401dd1ce16655182c1c5ffc (patch) | |
tree | 6b196decb7403095270bbc7a7d5cbe4fe39945da /drivers/char/ipmi/ipmi_watchdog.c | |
parent | 453823ba08ba762b3d58934b6dce75edce37169e (diff) |
[PATCH] IPMI: tidy up various things
Tidy up various coding standard things, mostly removing the space after !,
but also break some long lines and fix a few other spacing inconsistencies.
Also fixes some bad error reporting when deleting an IPMI user.
Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/ipmi/ipmi_watchdog.c')
-rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 7ece9f3c8f70..2872c9575528 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
@@ -589,7 +589,7 @@ static void panic_halt_ipmi_heartbeat(void) | |||
589 | 1); | 589 | 1); |
590 | } | 590 | } |
591 | 591 | ||
592 | static struct watchdog_info ident= | 592 | static struct watchdog_info ident = |
593 | { | 593 | { |
594 | .options = 0, /* WDIOF_SETTIMEOUT, */ | 594 | .options = 0, /* WDIOF_SETTIMEOUT, */ |
595 | .firmware_version = 1, | 595 | .firmware_version = 1, |
@@ -790,13 +790,13 @@ static int ipmi_fasync(int fd, struct file *file, int on) | |||
790 | 790 | ||
791 | static int ipmi_close(struct inode *ino, struct file *filep) | 791 | static int ipmi_close(struct inode *ino, struct file *filep) |
792 | { | 792 | { |
793 | if (iminor(ino)==WATCHDOG_MINOR) | 793 | if (iminor(ino) == WATCHDOG_MINOR) { |
794 | { | ||
795 | if (expect_close == 42) { | 794 | if (expect_close == 42) { |
796 | ipmi_watchdog_state = WDOG_TIMEOUT_NONE; | 795 | ipmi_watchdog_state = WDOG_TIMEOUT_NONE; |
797 | ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB); | 796 | ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB); |
798 | } else { | 797 | } else { |
799 | printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n"); | 798 | printk(KERN_CRIT PFX |
799 | "Unexpected close, not stopping watchdog!\n"); | ||
800 | ipmi_heartbeat(); | 800 | ipmi_heartbeat(); |
801 | } | 801 | } |
802 | clear_bit(0, &ipmi_wdog_open); | 802 | clear_bit(0, &ipmi_wdog_open); |