Commit 5f3b2756 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck

watchdog: cleanup spaces before tabs

cleanup spaces before tabs in drivers/watchdog/
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 4562f539
...@@ -362,12 +362,12 @@ static int __init ali_find_watchdog(void) ...@@ -362,12 +362,12 @@ static int __init ali_find_watchdog(void)
*/ */
static const struct file_operations ali_fops = { static const struct file_operations ali_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = ali_write, .write = ali_write,
.unlocked_ioctl = ali_ioctl, .unlocked_ioctl = ali_ioctl,
.open = ali_open, .open = ali_open,
.release = ali_release, .release = ali_release,
}; };
static struct miscdevice ali_miscdev = { static struct miscdevice ali_miscdev = {
......
...@@ -150,8 +150,8 @@ static ssize_t bcm47xx_wdt_write(struct file *file, const char __user *data, ...@@ -150,8 +150,8 @@ static ssize_t bcm47xx_wdt_write(struct file *file, const char __user *data,
} }
static const struct watchdog_info bcm47xx_wdt_info = { static const struct watchdog_info bcm47xx_wdt_info = {
.identity = DRV_NAME, .identity = DRV_NAME,
.options = WDIOF_SETTIMEOUT | .options = WDIOF_SETTIMEOUT |
WDIOF_KEEPALIVEPING | WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE, WDIOF_MAGICCLOSE,
}; };
......
...@@ -63,7 +63,7 @@ static DEFINE_SPINLOCK(bfin_wdt_spinlock); ...@@ -63,7 +63,7 @@ static DEFINE_SPINLOCK(bfin_wdt_spinlock);
/** /**
* bfin_wdt_keepalive - Keep the Userspace Watchdog Alive * bfin_wdt_keepalive - Keep the Userspace Watchdog Alive
* *
* The Userspace watchdog got a KeepAlive: schedule the next timeout. * The Userspace watchdog got a KeepAlive: schedule the next timeout.
*/ */
static int bfin_wdt_keepalive(void) static int bfin_wdt_keepalive(void)
{ {
...@@ -337,7 +337,7 @@ static int bfin_wdt_resume(struct platform_device *pdev) ...@@ -337,7 +337,7 @@ static int bfin_wdt_resume(struct platform_device *pdev)
static const struct file_operations bfin_wdt_fops = { static const struct file_operations bfin_wdt_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = bfin_wdt_write, .write = bfin_wdt_write,
.unlocked_ioctl = bfin_wdt_ioctl, .unlocked_ioctl = bfin_wdt_ioctl,
.open = bfin_wdt_open, .open = bfin_wdt_open,
.release = bfin_wdt_release, .release = bfin_wdt_release,
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
* interface and Solaris-compatible ioctls as best it is * interface and Solaris-compatible ioctls as best it is
* able. * able.
* *
* NOTE: CP1400 systems appear to have a defective intr_mask * NOTE: CP1400 systems appear to have a defective intr_mask
* register on the PLD, preventing the disabling of * register on the PLD, preventing the disabling of
* timer interrupts. We use a timer to periodically * timer interrupts. We use a timer to periodically
* reset 'stopped' watchdogs on affected platforms. * reset 'stopped' watchdogs on affected platforms.
* *
* Copyright (c) 2000 Eric Brower (ebrower@usa.net) * Copyright (c) 2000 Eric Brower (ebrower@usa.net)
* Copyright (C) 2008 David S. Miller <davem@davemloft.net> * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
...@@ -107,13 +107,13 @@ static struct cpwd *cpwd_device; ...@@ -107,13 +107,13 @@ static struct cpwd *cpwd_device;
* ------------------- * -------------------
* |- counter val -| * |- counter val -|
* ------------------- * -------------------
* dcntr - Current 16-bit downcounter value. * dcntr - Current 16-bit downcounter value.
* When downcounter reaches '0' watchdog expires. * When downcounter reaches '0' watchdog expires.
* Reading this register resets downcounter with * Reading this register resets downcounter with
* 'limit' value. * 'limit' value.
* limit - 16-bit countdown value in 1/10th second increments. * limit - 16-bit countdown value in 1/10th second increments.
* Writing this register begins countdown with input value. * Writing this register begins countdown with input value.
* Reading from this register does not affect counter. * Reading from this register does not affect counter.
* NOTES: After watchdog reset, dcntr and limit contain '1' * NOTES: After watchdog reset, dcntr and limit contain '1'
* *
* status register (byte access): * status register (byte access):
...@@ -123,7 +123,7 @@ static struct cpwd *cpwd_device; ...@@ -123,7 +123,7 @@ static struct cpwd *cpwd_device;
* |- UNUSED -| EXP | RUN | * |- UNUSED -| EXP | RUN |
* --------------------------- * ---------------------------
* status- Bit 0 - Watchdog is running * status- Bit 0 - Watchdog is running
* Bit 1 - Watchdog has expired * Bit 1 - Watchdog has expired
* *
*** PLD register block definition (struct wd_pld_regblk) *** PLD register block definition (struct wd_pld_regblk)
* *
...@@ -197,7 +197,7 @@ static u8 cpwd_readb(void __iomem *addr) ...@@ -197,7 +197,7 @@ static u8 cpwd_readb(void __iomem *addr)
* Because of the CP1400 defect this should only be * Because of the CP1400 defect this should only be
* called during initialzation or by wd_[start|stop]timer() * called during initialzation or by wd_[start|stop]timer()
* *
* index - sub-device index, or -1 for 'all' * index - sub-device index, or -1 for 'all'
* enable - non-zero to enable interrupts, zero to disable * enable - non-zero to enable interrupts, zero to disable
*/ */
static void cpwd_toggleintr(struct cpwd *p, int index, int enable) static void cpwd_toggleintr(struct cpwd *p, int index, int enable)
...@@ -317,13 +317,13 @@ static int cpwd_getstatus(struct cpwd *p, int index) ...@@ -317,13 +317,13 @@ static int cpwd_getstatus(struct cpwd *p, int index)
} else { } else {
/* Fudge WD_EXPIRED status for defective CP1400-- /* Fudge WD_EXPIRED status for defective CP1400--
* IF timer is running * IF timer is running
* AND brokenstop is set * AND brokenstop is set
* AND an interrupt has been serviced * AND an interrupt has been serviced
* we are WD_EXPIRED. * we are WD_EXPIRED.
* *
* IF timer is running * IF timer is running
* AND brokenstop is set * AND brokenstop is set
* AND no interrupt has been serviced * AND no interrupt has been serviced
* we are WD_FREERUN. * we are WD_FREERUN.
*/ */
if (p->broken && if (p->broken &&
...@@ -614,7 +614,7 @@ static int __devinit cpwd_probe(struct platform_device *op, ...@@ -614,7 +614,7 @@ static int __devinit cpwd_probe(struct platform_device *op,
if (p->broken) { if (p->broken) {
init_timer(&cpwd_timer); init_timer(&cpwd_timer);
cpwd_timer.function = cpwd_brokentimer; cpwd_timer.function = cpwd_brokentimer;
cpwd_timer.data = (unsigned long) p; cpwd_timer.data = (unsigned long) p;
cpwd_timer.expires = WD_BTIMEOUT; cpwd_timer.expires = WD_BTIMEOUT;
......
...@@ -201,7 +201,7 @@ static void eurwdt_ping(void) ...@@ -201,7 +201,7 @@ static void eurwdt_ping(void)
static ssize_t eurwdt_write(struct file *file, const char __user *buf, static ssize_t eurwdt_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
if (count) { if (count) {
if (!nowayout) { if (!nowayout) {
size_t i; size_t i;
......
...@@ -247,7 +247,7 @@ static struct { ...@@ -247,7 +247,7 @@ static struct {
{NULL, 0} {NULL, 0}
}; };
#define ITCO_PCI_DEVICE(dev, data) \ #define ITCO_PCI_DEVICE(dev, data) \
.vendor = PCI_VENDOR_ID_INTEL, \ .vendor = PCI_VENDOR_ID_INTEL, \
.device = dev, \ .device = dev, \
.subvendor = PCI_ANY_ID, \ .subvendor = PCI_ANY_ID, \
......
...@@ -69,7 +69,7 @@ static unsigned short address; ...@@ -69,7 +69,7 @@ static unsigned short address;
#define IT8712F_DEVID 0x8712 #define IT8712F_DEVID 0x8712
#define LDN_GPIO 0x07 /* GPIO and Watch Dog Timer */ #define LDN_GPIO 0x07 /* GPIO and Watch Dog Timer */
#define LDN_GAME 0x09 /* Game Port */ #define LDN_GAME 0x09 /* Game Port */
#define WDT_CONTROL 0x71 /* WDT Register: Control */ #define WDT_CONTROL 0x71 /* WDT Register: Control */
#define WDT_CONFIG 0x72 /* WDT Register: Configuration */ #define WDT_CONFIG 0x72 /* WDT Register: Configuration */
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
/* Defaults for Module Parameter */ /* Defaults for Module Parameter */
#define DEFAULT_NOGAMEPORT 0 #define DEFAULT_NOGAMEPORT 0
#define DEFAULT_EXCLUSIVE 1 #define DEFAULT_EXCLUSIVE 1
#define DEFAULT_TIMEOUT 60 #define DEFAULT_TIMEOUT 60
#define DEFAULT_TESTMODE 0 #define DEFAULT_TESTMODE 0
#define DEFAULT_NOWAYOUT WATCHDOG_NOWAYOUT #define DEFAULT_NOWAYOUT WATCHDOG_NOWAYOUT
...@@ -70,9 +70,9 @@ ...@@ -70,9 +70,9 @@
/* Configuration Registers and Functions */ /* Configuration Registers and Functions */
#define LDNREG 0x07 #define LDNREG 0x07
#define CHIPID 0x20 #define CHIPID 0x20
#define CHIPREV 0x22 #define CHIPREV 0x22
#define ACTREG 0x30 #define ACTREG 0x30
#define BASEREG 0x60 #define BASEREG 0x60
/* Chip Id numbers */ /* Chip Id numbers */
#define NO_DEV_ID 0xffff #define NO_DEV_ID 0xffff
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
#define IT8726_ID 0x8726 /* the data sheet suggest wrongly 0x8716 */ #define IT8726_ID 0x8726 /* the data sheet suggest wrongly 0x8716 */
/* GPIO Configuration Registers LDN=0x07 */ /* GPIO Configuration Registers LDN=0x07 */
#define WDTCTRL 0x71 #define WDTCTRL 0x71
#define WDTCFG 0x72 #define WDTCFG 0x72
#define WDTVALLSB 0x73 #define WDTVALLSB 0x73
#define WDTVALMSB 0x74 #define WDTVALMSB 0x74
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
#define WDT_INT_MASK 0x0f #define WDT_INT_MASK 0x0f
/* CIR Configuration Register LDN=0x0a */ /* CIR Configuration Register LDN=0x0a */
#define CIR_ILS 0x70 #define CIR_ILS 0x70
/* The default Base address is not always available, we use this */ /* The default Base address is not always available, we use this */
#define CIR_BASE 0x0208 #define CIR_BASE 0x0208
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
/* indexes */ /* size */ /* indexes */ /* size */
#define ZFL_VERSION 0x02 /* 16 */ #define ZFL_VERSION 0x02 /* 16 */
#define CONTROL 0x10 /* 16 */ #define CONTROL 0x10 /* 16 */
#define STATUS 0x12 /* 8 */ #define STATUS 0x12 /* 8 */
#define COUNTER_1 0x0C /* 16 */ #define COUNTER_1 0x0C /* 16 */
#define COUNTER_2 0x0E /* 8 */ #define COUNTER_2 0x0E /* 8 */
......
...@@ -41,7 +41,7 @@ static int nowayout = WATCHDOG_NOWAYOUT; ...@@ -41,7 +41,7 @@ static int nowayout = WATCHDOG_NOWAYOUT;
* to ping the watchdog. * to ping the watchdog.
*/ */
#define MAX6369_WDSET (7 << 0) #define MAX6369_WDSET (7 << 0)
#define MAX6369_WDI (1 << 3) #define MAX6369_WDI (1 << 3)
static DEFINE_SPINLOCK(io_lock); static DEFINE_SPINLOCK(io_lock);
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface * mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface
* *
* Authors: Dave Updegraff <dave@cray.org> * Authors: Dave Updegraff <dave@cray.org>
* Kumar Gala <galak@kernel.crashing.org> * Kumar Gala <galak@kernel.crashing.org>
* Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org> * Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org>
* ..and from sc520_wdt * ..and from sc520_wdt
* Copyright (c) 2008 MontaVista Software, Inc. * Copyright (c) 2008 MontaVista Software, Inc.
* Anton Vorontsov <avorontsov@ru.mvista.com> * Anton Vorontsov <avorontsov@ru.mvista.com>
* *
......
...@@ -172,7 +172,7 @@ static int mpcore_wdt_release(struct inode *inode, struct file *file) ...@@ -172,7 +172,7 @@ static int mpcore_wdt_release(struct inode *inode, struct file *file)
/* /*
* Shut off the timer. * Shut off the timer.
* Lock it in if it's a module and we set nowayout * Lock it in if it's a module and we set nowayout
*/ */
if (wdt->expect_close == 42) if (wdt->expect_close == 42)
mpcore_wdt_stop(wdt); mpcore_wdt_stop(wdt);
......
...@@ -190,19 +190,19 @@ static ssize_t mtx1_wdt_write(struct file *file, const char *buf, ...@@ -190,19 +190,19 @@ static ssize_t mtx1_wdt_write(struct file *file, const char *buf,
} }
static const struct file_operations mtx1_wdt_fops = { static const struct file_operations mtx1_wdt_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.unlocked_ioctl = mtx1_wdt_ioctl, .unlocked_ioctl = mtx1_wdt_ioctl,
.open = mtx1_wdt_open, .open = mtx1_wdt_open,
.write = mtx1_wdt_write, .write = mtx1_wdt_write,
.release = mtx1_wdt_release, .release = mtx1_wdt_release,
}; };
static struct miscdevice mtx1_wdt_misc = { static struct miscdevice mtx1_wdt_misc = {
.minor = WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
.name = "watchdog", .name = "watchdog",
.fops = &mtx1_wdt_fops, .fops = &mtx1_wdt_fops,
}; };
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
* months before firing. These limits work without scaling, * months before firing. These limits work without scaling,
* with the 60 second default assumed by most tools and docs. * with the 60 second default assumed by most tools and docs.
*/ */
#define TIMER_MARGIN_MAX (24 * 60 * 60) /* 1 day */ #define TIMER_MARGIN_MAX (24 * 60 * 60) /* 1 day */
#define TIMER_MARGIN_DEFAULT 60 /* 60 secs */ #define TIMER_MARGIN_DEFAULT 60 /* 60 secs */
#define TIMER_MARGIN_MIN 1 #define TIMER_MARGIN_MIN 1
......
...@@ -514,7 +514,7 @@ static struct miscdevice pc87413_miscdev = { ...@@ -514,7 +514,7 @@ static struct miscdevice pc87413_miscdev = {
/* -- Module init functions -------------------------------------*/ /* -- Module init functions -------------------------------------*/
/** /**
* pc87413_init: module's "constructor" * pc87413_init: module's "constructor"
* *
* Set up the WDT watchdog board. All we have to do is grab the * Set up the WDT watchdog board. All we have to do is grab the
* resources we require and bitch if anyone beat us to them. * resources we require and bitch if anyone beat us to them.
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Watchdog driver for PNX4008 board * Watchdog driver for PNX4008 board
* *
* Authors: Dmitry Chigirev <source@mvista.com>, * Authors: Dmitry Chigirev <source@mvista.com>,
* Vitaly Wool <vitalywool@gmail.com> * Vitaly Wool <vitalywool@gmail.com>
* Based on sa1100 driver, * Based on sa1100 driver,
* Copyright (C) 2000 Oleg Drokin <green@crimea.edu> * Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
* *
......
...@@ -224,7 +224,7 @@ static int s3c2410wdt_release(struct inode *inode, struct file *file) ...@@ -224,7 +224,7 @@ static int s3c2410wdt_release(struct inode *inode, struct file *file)
{ {
/* /*
* Shut off the timer. * Shut off the timer.
* Lock it in if it's a module and we set nowayout * Lock it in if it's a module and we set nowayout
*/ */
if (expect_close == 42) if (expect_close == 42)
......
...@@ -114,7 +114,7 @@ static char expect_close; ...@@ -114,7 +114,7 @@ static char expect_close;
* C | 6.5s 65s 650s 1300s * C | 6.5s 65s 650s 1300s
* D | 7s 70s 700s 1400s * D | 7s 70s 700s 1400s
* E | 7.5s 75s 750s 1500s * E | 7.5s 75s 750s 1500s
* F | 8s 80s 800s 1600s * F | 8s 80s 800s 1600s
* *
* Another way to say the same things is: * Another way to say the same things is:
* For N=1, Timeout = (M+1) * 0.5s * For N=1, Timeout = (M+1) * 0.5s
......
...@@ -41,7 +41,7 @@ static DEFINE_MUTEX(wdt_lock); ...@@ -41,7 +41,7 @@ static DEFINE_MUTEX(wdt_lock);
#define IFACE_ON_COMMAND 1 #define IFACE_ON_COMMAND 1
#define REBOOT_COMMAND 2 #define REBOOT_COMMAND 2
#define WATCHDOG_NAME "SBC-FITPC2 Watchdog" #define WATCHDOG_NAME "SBC-FITPC2 Watchdog"
static void wdt_send_data(unsigned char command, unsigned char data) static void wdt_send_data(unsigned char command, unsigned char data)
{ {
......
...@@ -434,11 +434,11 @@ static long wb_smsc_wdt_ioctl(struct file *file, ...@@ -434,11 +434,11 @@ static long wb_smsc_wdt_ioctl(struct file *file,
} uarg; } uarg;
static const struct watchdog_info ident = { static const struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING | .options = WDIOF_KEEPALIVEPING |
WDIOF_SETTIMEOUT | WDIOF_SETTIMEOUT |
WDIOF_MAGICCLOSE, WDIOF_MAGICCLOSE,
.firmware_version = 0, .firmware_version = 0,
.identity = "SMsC 37B787 Watchdog", .identity = "SMsC 37B787 Watchdog",
}; };
uarg.i = (int __user *)arg; uarg.i = (int __user *)arg;
......
...@@ -151,7 +151,7 @@ static int softdog_release(struct inode *inode, struct file *file) ...@@ -151,7 +151,7 @@ static int softdog_release(struct inode *inode, struct file *file)
{ {
/* /*
* Shut off the timer. * Shut off the timer.
* Lock it in if it's a module and we set nowayout * Lock it in if it's a module and we set nowayout
*/ */
if (expect_close == 42) { if (expect_close == 42) {
softdog_stop(); softdog_stop();
......
...@@ -68,7 +68,7 @@ struct platform_device *ts72xx_wdt_pdev; ...@@ -68,7 +68,7 @@ struct platform_device *ts72xx_wdt_pdev;
* to control register): * to control register):
* value description * value description
* ------------------------- * -------------------------
* 0x00 watchdog disabled * 0x00 watchdog disabled
* 0x01 250ms * 0x01 250ms
* 0x02 500ms * 0x02 500ms
* 0x03 1s * 0x03 1s
......
...@@ -87,10 +87,10 @@ static int w83697ug_select_wd_register(void) ...@@ -87,10 +87,10 @@ static int w83697ug_select_wd_register(void)
outb_p(0x87, WDT_EFER); /* Enter extended function mode */ outb_p(0x87, WDT_EFER); /* Enter extended function mode */
outb_p(0x87, WDT_EFER); /* Again according to manual */ outb_p(0x87, WDT_EFER); /* Again according to manual */
outb(0x20, WDT_EFER); /* check chip version */ outb(0x20, WDT_EFER); /* check chip version */
version = inb(WDT_EFDR); version = inb(WDT_EFDR);
if (version == 0x68) { /* W83697UG */ if (version == 0x68) { /* W83697UG */
printk(KERN_INFO PFX "Watchdog chip version 0x%02x = " printk(KERN_INFO PFX "Watchdog chip version 0x%02x = "
"W83697UG/UF found at 0x%04x\n", version, wdt_io); "W83697UG/UF found at 0x%04x\n", version, wdt_io);
......
...@@ -581,7 +581,7 @@ static void __exit wdt_exit(void) ...@@ -581,7 +581,7 @@ static void __exit wdt_exit(void)
} }
/** /**
* wdt_init: * wdt_init:
* *
* Set up the WDT watchdog board. All we have to do is grab the * Set up the WDT watchdog board. All we have to do is grab the
* resources we require and bitch if anyone beat us to them. * resources we require and bitch if anyone beat us to them.
......
...@@ -281,7 +281,7 @@ static int wdt977_release(struct inode *inode, struct file *file) ...@@ -281,7 +281,7 @@ static int wdt977_release(struct inode *inode, struct file *file)
{ {
/* /*
* Shut off the timer. * Shut off the timer.
* Lock it in if it's a module and we set nowayout * Lock it in if it's a module and we set nowayout
*/ */
if (expect_close == 42) { if (expect_close == 42) {
wdt977_stop(); wdt977_stop();
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
* Jeff Garzik : PCI cleanups * Jeff Garzik : PCI cleanups
* Tigran Aivazian : Restructured wdtpci_init_one() to handle * Tigran Aivazian : Restructured wdtpci_init_one() to handle
* failures * failures
* Joel Becker : Added WDIOC_GET/SETTIMEOUT * Joel Becker : Added WDIOC_GET/SETTIMEOUT
* Zwane Mwaikambo : Magic char closing, locking changes, * Zwane Mwaikambo : Magic char closing, locking changes,
* cleanups * cleanups
* Matt Domsch : nowayout module option * Matt Domsch : nowayout module option
...@@ -764,7 +764,7 @@ static void __exit wdtpci_cleanup(void) ...@@ -764,7 +764,7 @@ static void __exit wdtpci_cleanup(void)
/** /**
* wdtpci_init: * wdtpci_init:
* *
* Set up the WDT watchdog board. All we have to do is grab the * Set up the WDT watchdog board. All we have to do is grab the
* resources we require and bitch if anyone beat us to them. * resources we require and bitch if anyone beat us to them.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment