renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
Code

[WATCHDOG] w83697hf/hg WDT driver - patch 3

Browse Source 
This is patch 3 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Fix identation.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Samuel Tardieu 2006-09-07 11:57:00 +02:00 committed by Wim Van Sebroeck
parent b41a9f59d1
commit db16525e63
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/char/watchdog/w83697hf_wdt.c
View File

@ -6,7 +6,7 @@
* Based on w83627hf_wdt.c advantechwdt.c which is based on wdt.c. * Based on w83627hf_wdt.c advantechwdt.c which is based on wdt.c.
* Original copyright messages: * Original copyright messages:
* *
* (c) Copyright 2003 Pádraig Brady <P@draigBrady.com> * (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
* *
* (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl> * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
* *
@ -96,16 +96,16 @@ w83697hf_init(void)
w83697hf_select_wd_register(); w83697hf_select_wd_register();
outb_p(0xF3, WDT_EFER); /* Select CRF3 */ outb_p(0xF3, WDT_EFER); /* Select CRF3 */
t=inb_p(WDT_EFDR); /* read CRF3 */ t=inb_p(WDT_EFDR); /* read CRF3 */
if (t != 0) { if (t != 0) {
printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout); printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
outb_p(timeout, WDT_EFDR); /* Write back to CRF3 */ outb_p(timeout, WDT_EFDR); /* Write back to CRF3 */
} }
outb_p(0xF4, WDT_EFER); /* Select CRF4 */ outb_p(0xF4, WDT_EFER); /* Select CRF4 */
t=inb_p(WDT_EFDR); /* read CRF4 */ t=inb_p(WDT_EFDR); /* read CRF4 */
t&=~0x0C; /* set second mode & disable keyboard turning off watchdog */ t&=~0x0C; /* set second mode & disable keyboard turning off watchdog */
outb_p(t, WDT_EFDR); /* Write back to CRF4 */ outb_p(t, WDT_EFDR); /* Write back to CRF4 */
w83697hf_unselect_wd_register(); w83697hf_unselect_wd_register();
@ -187,51 +187,51 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
switch (cmd) { switch (cmd) {
case WDIOC_GETSUPPORT: case WDIOC_GETSUPPORT:
if (copy_to_user(argp, &ident, sizeof(ident))) if (copy_to_user(argp, &ident, sizeof(ident)))
return -EFAULT; return -EFAULT;
break; break;
case WDIOC_GETSTATUS: case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS: case WDIOC_GETBOOTSTATUS:
return put_user(0, p); return put_user(0, p);
case WDIOC_KEEPALIVE: case WDIOC_KEEPALIVE:
wdt_ping(); wdt_ping();
break; break;
case WDIOC_SETTIMEOUT: case WDIOC_SETTIMEOUT:
if (get_user(new_timeout, p)) if (get_user(new_timeout, p))
return -EFAULT; return -EFAULT;
if (wdt_set_heartbeat(new_timeout)) if (wdt_set_heartbeat(new_timeout))
return -EINVAL; return -EINVAL;
wdt_ping(); wdt_ping();
/* Fall */ /* Fall */
case WDIOC_GETTIMEOUT: case WDIOC_GETTIMEOUT:
return put_user(timeout, p); return put_user(timeout, p);
case WDIOC_SETOPTIONS: case WDIOC_SETOPTIONS:
{ {
int options, retval = -EINVAL; int options, retval = -EINVAL;
if (get_user(options, p)) if (get_user(options, p))
return -EFAULT; return -EFAULT;
if (options & WDIOS_DISABLECARD) { if (options & WDIOS_DISABLECARD) {
wdt_disable(); wdt_disable();
retval = 0; retval = 0;
} }
if (options & WDIOS_ENABLECARD) { if (options & WDIOS_ENABLECARD) {
wdt_ping(); wdt_ping();
retval = 0; retval = 0;
} }
return retval; return retval;
} }
default: default:
return -ENOTTY; return -ENOTTY;
} }
return 0; return 0;
} }
@ -255,7 +255,7 @@ wdt_close(struct inode *inode, struct file *file)
if (expect_close == 42) { if (expect_close == 42) {
wdt_disable(); wdt_disable();
} else { } else {
printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n"); printk (KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
wdt_ping(); wdt_ping();
} }
expect_close = 0; expect_close = 0;
@ -313,7 +313,7 @@ wdt_init(void)
spin_lock_init(&io_lock); spin_lock_init(&io_lock);
printk(KERN_INFO "WDT driver for the Winbond(TM) W83697HF Super I/O chip initialising.\n"); printk (KERN_INFO "WDT driver for the Winbond(TM) W83697HF Super I/O chip initialising.\n");
if (wdt_set_heartbeat(timeout)) { if (wdt_set_heartbeat(timeout)) {
wdt_set_heartbeat(WATCHDOG_TIMEOUT); wdt_set_heartbeat(WATCHDOG_TIMEOUT);