diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2011-02-23 15:04:38 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2011-03-15 12:02:27 -0400 |
commit | 5f3b27569fc0286a51f8d0655c7fb4f5b36aea65 (patch) | |
tree | 1e83d6c126dfb96157b8b1c65eb72b73607b01c3 | |
parent | 4562f53940432369df88e195ef8f9b642bdf7cd6 (diff) |
watchdog: cleanup spaces before tabs
cleanup spaces before tabs in drivers/watchdog/
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
26 files changed, 63 insertions, 63 deletions
diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c index f9e1b7eb6c49..f16dcbd475fb 100644 --- a/drivers/watchdog/alim1535_wdt.c +++ b/drivers/watchdog/alim1535_wdt.c | |||
@@ -362,12 +362,12 @@ static int __init ali_find_watchdog(void) | |||
362 | */ | 362 | */ |
363 | 363 | ||
364 | static const struct file_operations ali_fops = { | 364 | static const struct file_operations ali_fops = { |
365 | .owner = THIS_MODULE, | 365 | .owner = THIS_MODULE, |
366 | .llseek = no_llseek, | 366 | .llseek = no_llseek, |
367 | .write = ali_write, | 367 | .write = ali_write, |
368 | .unlocked_ioctl = ali_ioctl, | 368 | .unlocked_ioctl = ali_ioctl, |
369 | .open = ali_open, | 369 | .open = ali_open, |
370 | .release = ali_release, | 370 | .release = ali_release, |
371 | }; | 371 | }; |
372 | 372 | ||
373 | static struct miscdevice ali_miscdev = { | 373 | static struct miscdevice ali_miscdev = { |
diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c index 5f245522397b..bd44417c84d4 100644 --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c | |||
@@ -150,8 +150,8 @@ static ssize_t bcm47xx_wdt_write(struct file *file, const char __user *data, | |||
150 | } | 150 | } |
151 | 151 | ||
152 | static const struct watchdog_info bcm47xx_wdt_info = { | 152 | static const struct watchdog_info bcm47xx_wdt_info = { |
153 | .identity = DRV_NAME, | 153 | .identity = DRV_NAME, |
154 | .options = WDIOF_SETTIMEOUT | | 154 | .options = WDIOF_SETTIMEOUT | |
155 | WDIOF_KEEPALIVEPING | | 155 | WDIOF_KEEPALIVEPING | |
156 | WDIOF_MAGICCLOSE, | 156 | WDIOF_MAGICCLOSE, |
157 | }; | 157 | }; |
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c index 9042a95fc98c..b9fa9b71583a 100644 --- a/drivers/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c | |||
@@ -63,7 +63,7 @@ static DEFINE_SPINLOCK(bfin_wdt_spinlock); | |||
63 | /** | 63 | /** |
64 | * bfin_wdt_keepalive - Keep the Userspace Watchdog Alive | 64 | * bfin_wdt_keepalive - Keep the Userspace Watchdog Alive |
65 | * | 65 | * |
66 | * The Userspace watchdog got a KeepAlive: schedule the next timeout. | 66 | * The Userspace watchdog got a KeepAlive: schedule the next timeout. |
67 | */ | 67 | */ |
68 | static int bfin_wdt_keepalive(void) | 68 | static int bfin_wdt_keepalive(void) |
69 | { | 69 | { |
@@ -337,7 +337,7 @@ static int bfin_wdt_resume(struct platform_device *pdev) | |||
337 | static const struct file_operations bfin_wdt_fops = { | 337 | static const struct file_operations bfin_wdt_fops = { |
338 | .owner = THIS_MODULE, | 338 | .owner = THIS_MODULE, |
339 | .llseek = no_llseek, | 339 | .llseek = no_llseek, |
340 | .write = bfin_wdt_write, | 340 | .write = bfin_wdt_write, |
341 | .unlocked_ioctl = bfin_wdt_ioctl, | 341 | .unlocked_ioctl = bfin_wdt_ioctl, |
342 | .open = bfin_wdt_open, | 342 | .open = bfin_wdt_open, |
343 | .release = bfin_wdt_release, | 343 | .release = bfin_wdt_release, |
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c index 3de4ba0260a5..1e60ff331b90 100644 --- a/drivers/watchdog/cpwd.c +++ b/drivers/watchdog/cpwd.c | |||
@@ -5,10 +5,10 @@ | |||
5 | * interface and Solaris-compatible ioctls as best it is | 5 | * interface and Solaris-compatible ioctls as best it is |
6 | * able. | 6 | * able. |
7 | * | 7 | * |
8 | * NOTE: CP1400 systems appear to have a defective intr_mask | 8 | * NOTE: CP1400 systems appear to have a defective intr_mask |
9 | * register on the PLD, preventing the disabling of | 9 | * register on the PLD, preventing the disabling of |
10 | * timer interrupts. We use a timer to periodically | 10 | * timer interrupts. We use a timer to periodically |
11 | * reset 'stopped' watchdogs on affected platforms. | 11 | * reset 'stopped' watchdogs on affected platforms. |
12 | * | 12 | * |
13 | * Copyright (c) 2000 Eric Brower (ebrower@usa.net) | 13 | * Copyright (c) 2000 Eric Brower (ebrower@usa.net) |
14 | * Copyright (C) 2008 David S. Miller <davem@davemloft.net> | 14 | * Copyright (C) 2008 David S. Miller <davem@davemloft.net> |
@@ -107,13 +107,13 @@ static struct cpwd *cpwd_device; | |||
107 | * ------------------- | 107 | * ------------------- |
108 | * |- counter val -| | 108 | * |- counter val -| |
109 | * ------------------- | 109 | * ------------------- |
110 | * dcntr - Current 16-bit downcounter value. | 110 | * dcntr - Current 16-bit downcounter value. |
111 | * When downcounter reaches '0' watchdog expires. | 111 | * When downcounter reaches '0' watchdog expires. |
112 | * Reading this register resets downcounter with | 112 | * Reading this register resets downcounter with |
113 | * 'limit' value. | 113 | * 'limit' value. |
114 | * limit - 16-bit countdown value in 1/10th second increments. | 114 | * limit - 16-bit countdown value in 1/10th second increments. |
115 | * Writing this register begins countdown with input value. | 115 | * Writing this register begins countdown with input value. |
116 | * Reading from this register does not affect counter. | 116 | * Reading from this register does not affect counter. |
117 | * NOTES: After watchdog reset, dcntr and limit contain '1' | 117 | * NOTES: After watchdog reset, dcntr and limit contain '1' |
118 | * | 118 | * |
119 | * status register (byte access): | 119 | * status register (byte access): |
@@ -123,7 +123,7 @@ static struct cpwd *cpwd_device; | |||
123 | * |- UNUSED -| EXP | RUN | | 123 | * |- UNUSED -| EXP | RUN | |
124 | * --------------------------- | 124 | * --------------------------- |
125 | * status- Bit 0 - Watchdog is running | 125 | * status- Bit 0 - Watchdog is running |
126 | * Bit 1 - Watchdog has expired | 126 | * Bit 1 - Watchdog has expired |
127 | * | 127 | * |
128 | *** PLD register block definition (struct wd_pld_regblk) | 128 | *** PLD register block definition (struct wd_pld_regblk) |
129 | * | 129 | * |
@@ -197,7 +197,7 @@ static u8 cpwd_readb(void __iomem *addr) | |||
197 | * Because of the CP1400 defect this should only be | 197 | * Because of the CP1400 defect this should only be |
198 | * called during initialzation or by wd_[start|stop]timer() | 198 | * called during initialzation or by wd_[start|stop]timer() |
199 | * | 199 | * |
200 | * index - sub-device index, or -1 for 'all' | 200 | * index - sub-device index, or -1 for 'all' |
201 | * enable - non-zero to enable interrupts, zero to disable | 201 | * enable - non-zero to enable interrupts, zero to disable |
202 | */ | 202 | */ |
203 | static void cpwd_toggleintr(struct cpwd *p, int index, int enable) | 203 | 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 | } else { | 317 | } else { |
318 | /* Fudge WD_EXPIRED status for defective CP1400-- | 318 | /* Fudge WD_EXPIRED status for defective CP1400-- |
319 | * IF timer is running | 319 | * IF timer is running |
320 | * AND brokenstop is set | 320 | * AND brokenstop is set |
321 | * AND an interrupt has been serviced | 321 | * AND an interrupt has been serviced |
322 | * we are WD_EXPIRED. | 322 | * we are WD_EXPIRED. |
323 | * | 323 | * |
324 | * IF timer is running | 324 | * IF timer is running |
325 | * AND brokenstop is set | 325 | * AND brokenstop is set |
326 | * AND no interrupt has been serviced | 326 | * AND no interrupt has been serviced |
327 | * we are WD_FREERUN. | 327 | * we are WD_FREERUN. |
328 | */ | 328 | */ |
329 | if (p->broken && | 329 | if (p->broken && |
@@ -614,7 +614,7 @@ static int __devinit cpwd_probe(struct platform_device *op, | |||
614 | 614 | ||
615 | if (p->broken) { | 615 | if (p->broken) { |
616 | init_timer(&cpwd_timer); | 616 | init_timer(&cpwd_timer); |
617 | cpwd_timer.function = cpwd_brokentimer; | 617 | cpwd_timer.function = cpwd_brokentimer; |
618 | cpwd_timer.data = (unsigned long) p; | 618 | cpwd_timer.data = (unsigned long) p; |
619 | cpwd_timer.expires = WD_BTIMEOUT; | 619 | cpwd_timer.expires = WD_BTIMEOUT; |
620 | 620 | ||
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c index 3f3dc093ad68..f1d1da662fbe 100644 --- a/drivers/watchdog/eurotechwdt.c +++ b/drivers/watchdog/eurotechwdt.c | |||
@@ -201,7 +201,7 @@ static void eurwdt_ping(void) | |||
201 | static ssize_t eurwdt_write(struct file *file, const char __user *buf, | 201 | static ssize_t eurwdt_write(struct file *file, const char __user *buf, |
202 | size_t count, loff_t *ppos) | 202 | size_t count, loff_t *ppos) |
203 | { | 203 | { |
204 | if (count) { | 204 | if (count) { |
205 | if (!nowayout) { | 205 | if (!nowayout) { |
206 | size_t i; | 206 | size_t i; |
207 | 207 | ||
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index db0f5b85ba5f..35a0d12dad73 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c | |||
@@ -247,7 +247,7 @@ static struct { | |||
247 | {NULL, 0} | 247 | {NULL, 0} |
248 | }; | 248 | }; |
249 | 249 | ||
250 | #define ITCO_PCI_DEVICE(dev, data) \ | 250 | #define ITCO_PCI_DEVICE(dev, data) \ |
251 | .vendor = PCI_VENDOR_ID_INTEL, \ | 251 | .vendor = PCI_VENDOR_ID_INTEL, \ |
252 | .device = dev, \ | 252 | .device = dev, \ |
253 | .subvendor = PCI_ANY_ID, \ | 253 | .subvendor = PCI_ANY_ID, \ |
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c index b32c6c045b1a..6143f52ba6b8 100644 --- a/drivers/watchdog/it8712f_wdt.c +++ b/drivers/watchdog/it8712f_wdt.c | |||
@@ -69,7 +69,7 @@ static unsigned short address; | |||
69 | #define IT8712F_DEVID 0x8712 | 69 | #define IT8712F_DEVID 0x8712 |
70 | 70 | ||
71 | #define LDN_GPIO 0x07 /* GPIO and Watch Dog Timer */ | 71 | #define LDN_GPIO 0x07 /* GPIO and Watch Dog Timer */ |
72 | #define LDN_GAME 0x09 /* Game Port */ | 72 | #define LDN_GAME 0x09 /* Game Port */ |
73 | 73 | ||
74 | #define WDT_CONTROL 0x71 /* WDT Register: Control */ | 74 | #define WDT_CONTROL 0x71 /* WDT Register: Control */ |
75 | #define WDT_CONFIG 0x72 /* WDT Register: Configuration */ | 75 | #define WDT_CONFIG 0x72 /* WDT Register: Configuration */ |
diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c index e5c8b37bf739..b1bc72f9a209 100644 --- a/drivers/watchdog/it87_wdt.c +++ b/drivers/watchdog/it87_wdt.c | |||
@@ -54,7 +54,7 @@ | |||
54 | /* Defaults for Module Parameter */ | 54 | /* Defaults for Module Parameter */ |
55 | #define DEFAULT_NOGAMEPORT 0 | 55 | #define DEFAULT_NOGAMEPORT 0 |
56 | #define DEFAULT_EXCLUSIVE 1 | 56 | #define DEFAULT_EXCLUSIVE 1 |
57 | #define DEFAULT_TIMEOUT 60 | 57 | #define DEFAULT_TIMEOUT 60 |
58 | #define DEFAULT_TESTMODE 0 | 58 | #define DEFAULT_TESTMODE 0 |
59 | #define DEFAULT_NOWAYOUT WATCHDOG_NOWAYOUT | 59 | #define DEFAULT_NOWAYOUT WATCHDOG_NOWAYOUT |
60 | 60 | ||
@@ -70,9 +70,9 @@ | |||
70 | /* Configuration Registers and Functions */ | 70 | /* Configuration Registers and Functions */ |
71 | #define LDNREG 0x07 | 71 | #define LDNREG 0x07 |
72 | #define CHIPID 0x20 | 72 | #define CHIPID 0x20 |
73 | #define CHIPREV 0x22 | 73 | #define CHIPREV 0x22 |
74 | #define ACTREG 0x30 | 74 | #define ACTREG 0x30 |
75 | #define BASEREG 0x60 | 75 | #define BASEREG 0x60 |
76 | 76 | ||
77 | /* Chip Id numbers */ | 77 | /* Chip Id numbers */ |
78 | #define NO_DEV_ID 0xffff | 78 | #define NO_DEV_ID 0xffff |
@@ -86,7 +86,7 @@ | |||
86 | #define IT8726_ID 0x8726 /* the data sheet suggest wrongly 0x8716 */ | 86 | #define IT8726_ID 0x8726 /* the data sheet suggest wrongly 0x8716 */ |
87 | 87 | ||
88 | /* GPIO Configuration Registers LDN=0x07 */ | 88 | /* GPIO Configuration Registers LDN=0x07 */ |
89 | #define WDTCTRL 0x71 | 89 | #define WDTCTRL 0x71 |
90 | #define WDTCFG 0x72 | 90 | #define WDTCFG 0x72 |
91 | #define WDTVALLSB 0x73 | 91 | #define WDTVALLSB 0x73 |
92 | #define WDTVALMSB 0x74 | 92 | #define WDTVALMSB 0x74 |
@@ -107,7 +107,7 @@ | |||
107 | #define WDT_INT_MASK 0x0f | 107 | #define WDT_INT_MASK 0x0f |
108 | 108 | ||
109 | /* CIR Configuration Register LDN=0x0a */ | 109 | /* CIR Configuration Register LDN=0x0a */ |
110 | #define CIR_ILS 0x70 | 110 | #define CIR_ILS 0x70 |
111 | 111 | ||
112 | /* The default Base address is not always available, we use this */ | 112 | /* The default Base address is not always available, we use this */ |
113 | #define CIR_BASE 0x0208 | 113 | #define CIR_BASE 0x0208 |
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index 928035069396..1332b838cc58 100644 --- a/drivers/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c | |||
@@ -54,7 +54,7 @@ | |||
54 | 54 | ||
55 | /* indexes */ /* size */ | 55 | /* indexes */ /* size */ |
56 | #define ZFL_VERSION 0x02 /* 16 */ | 56 | #define ZFL_VERSION 0x02 /* 16 */ |
57 | #define CONTROL 0x10 /* 16 */ | 57 | #define CONTROL 0x10 /* 16 */ |
58 | #define STATUS 0x12 /* 8 */ | 58 | #define STATUS 0x12 /* 8 */ |
59 | #define COUNTER_1 0x0C /* 16 */ | 59 | #define COUNTER_1 0x0C /* 16 */ |
60 | #define COUNTER_2 0x0E /* 8 */ | 60 | #define COUNTER_2 0x0E /* 8 */ |
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index 3053ff05ca41..7a82ce5a6337 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c | |||
@@ -41,7 +41,7 @@ static int nowayout = WATCHDOG_NOWAYOUT; | |||
41 | * to ping the watchdog. | 41 | * to ping the watchdog. |
42 | */ | 42 | */ |
43 | #define MAX6369_WDSET (7 << 0) | 43 | #define MAX6369_WDSET (7 << 0) |
44 | #define MAX6369_WDI (1 << 3) | 44 | #define MAX6369_WDI (1 << 3) |
45 | 45 | ||
46 | static DEFINE_SPINLOCK(io_lock); | 46 | static DEFINE_SPINLOCK(io_lock); |
47 | 47 | ||
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index 8fa213cdb499..3dee837190ea 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
@@ -2,9 +2,9 @@ | |||
2 | * mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface | 2 | * mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface |
3 | * | 3 | * |
4 | * Authors: Dave Updegraff <dave@cray.org> | 4 | * Authors: Dave Updegraff <dave@cray.org> |
5 | * Kumar Gala <galak@kernel.crashing.org> | 5 | * Kumar Gala <galak@kernel.crashing.org> |
6 | * Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org> | 6 | * Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org> |
7 | * ..and from sc520_wdt | 7 | * ..and from sc520_wdt |
8 | * Copyright (c) 2008 MontaVista Software, Inc. | 8 | * Copyright (c) 2008 MontaVista Software, Inc. |
9 | * Anton Vorontsov <avorontsov@ru.mvista.com> | 9 | * Anton Vorontsov <avorontsov@ru.mvista.com> |
10 | * | 10 | * |
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c index b8ec7aca3c8e..2b4af222b5f2 100644 --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c | |||
@@ -172,7 +172,7 @@ static int mpcore_wdt_release(struct inode *inode, struct file *file) | |||
172 | 172 | ||
173 | /* | 173 | /* |
174 | * Shut off the timer. | 174 | * Shut off the timer. |
175 | * Lock it in if it's a module and we set nowayout | 175 | * Lock it in if it's a module and we set nowayout |
176 | */ | 176 | */ |
177 | if (wdt->expect_close == 42) | 177 | if (wdt->expect_close == 42) |
178 | mpcore_wdt_stop(wdt); | 178 | mpcore_wdt_stop(wdt); |
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index 08e8a6ab74e1..5ec5ac1f7878 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c | |||
@@ -190,19 +190,19 @@ static ssize_t mtx1_wdt_write(struct file *file, const char *buf, | |||
190 | } | 190 | } |
191 | 191 | ||
192 | static const struct file_operations mtx1_wdt_fops = { | 192 | static const struct file_operations mtx1_wdt_fops = { |
193 | .owner = THIS_MODULE, | 193 | .owner = THIS_MODULE, |
194 | .llseek = no_llseek, | 194 | .llseek = no_llseek, |
195 | .unlocked_ioctl = mtx1_wdt_ioctl, | 195 | .unlocked_ioctl = mtx1_wdt_ioctl, |
196 | .open = mtx1_wdt_open, | 196 | .open = mtx1_wdt_open, |
197 | .write = mtx1_wdt_write, | 197 | .write = mtx1_wdt_write, |
198 | .release = mtx1_wdt_release, | 198 | .release = mtx1_wdt_release, |
199 | }; | 199 | }; |
200 | 200 | ||
201 | 201 | ||
202 | static struct miscdevice mtx1_wdt_misc = { | 202 | static struct miscdevice mtx1_wdt_misc = { |
203 | .minor = WATCHDOG_MINOR, | 203 | .minor = WATCHDOG_MINOR, |
204 | .name = "watchdog", | 204 | .name = "watchdog", |
205 | .fops = &mtx1_wdt_fops, | 205 | .fops = &mtx1_wdt_fops, |
206 | }; | 206 | }; |
207 | 207 | ||
208 | 208 | ||
diff --git a/drivers/watchdog/omap_wdt.h b/drivers/watchdog/omap_wdt.h index fc02ec6a0386..09b774cf75b9 100644 --- a/drivers/watchdog/omap_wdt.h +++ b/drivers/watchdog/omap_wdt.h | |||
@@ -44,7 +44,7 @@ | |||
44 | * months before firing. These limits work without scaling, | 44 | * months before firing. These limits work without scaling, |
45 | * with the 60 second default assumed by most tools and docs. | 45 | * with the 60 second default assumed by most tools and docs. |
46 | */ | 46 | */ |
47 | #define TIMER_MARGIN_MAX (24 * 60 * 60) /* 1 day */ | 47 | #define TIMER_MARGIN_MAX (24 * 60 * 60) /* 1 day */ |
48 | #define TIMER_MARGIN_DEFAULT 60 /* 60 secs */ | 48 | #define TIMER_MARGIN_DEFAULT 60 /* 60 secs */ |
49 | #define TIMER_MARGIN_MIN 1 | 49 | #define TIMER_MARGIN_MIN 1 |
50 | 50 | ||
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c index 3a56bc360924..139d773300c6 100644 --- a/drivers/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c | |||
@@ -514,7 +514,7 @@ static struct miscdevice pc87413_miscdev = { | |||
514 | /* -- Module init functions -------------------------------------*/ | 514 | /* -- Module init functions -------------------------------------*/ |
515 | 515 | ||
516 | /** | 516 | /** |
517 | * pc87413_init: module's "constructor" | 517 | * pc87413_init: module's "constructor" |
518 | * | 518 | * |
519 | * Set up the WDT watchdog board. All we have to do is grab the | 519 | * Set up the WDT watchdog board. All we have to do is grab the |
520 | * resources we require and bitch if anyone beat us to them. | 520 | * resources we require and bitch if anyone beat us to them. |
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index bf5b97c546eb..c7cf4cbf8ab3 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Watchdog driver for PNX4008 board | 4 | * Watchdog driver for PNX4008 board |
5 | * | 5 | * |
6 | * Authors: Dmitry Chigirev <source@mvista.com>, | 6 | * Authors: Dmitry Chigirev <source@mvista.com>, |
7 | * Vitaly Wool <vitalywool@gmail.com> | 7 | * Vitaly Wool <vitalywool@gmail.com> |
8 | * Based on sa1100 driver, | 8 | * Based on sa1100 driver, |
9 | * Copyright (C) 2000 Oleg Drokin <green@crimea.edu> | 9 | * Copyright (C) 2000 Oleg Drokin <green@crimea.edu> |
10 | * | 10 | * |
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index ae53662c29bc..25b39bf35925 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
@@ -224,7 +224,7 @@ static int s3c2410wdt_release(struct inode *inode, struct file *file) | |||
224 | { | 224 | { |
225 | /* | 225 | /* |
226 | * Shut off the timer. | 226 | * Shut off the timer. |
227 | * Lock it in if it's a module and we set nowayout | 227 | * Lock it in if it's a module and we set nowayout |
228 | */ | 228 | */ |
229 | 229 | ||
230 | if (expect_close == 42) | 230 | if (expect_close == 42) |
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c index 68e2e2d6f73d..514ec23050f7 100644 --- a/drivers/watchdog/sbc8360.c +++ b/drivers/watchdog/sbc8360.c | |||
@@ -114,7 +114,7 @@ static char expect_close; | |||
114 | * C | 6.5s 65s 650s 1300s | 114 | * C | 6.5s 65s 650s 1300s |
115 | * D | 7s 70s 700s 1400s | 115 | * D | 7s 70s 700s 1400s |
116 | * E | 7.5s 75s 750s 1500s | 116 | * E | 7.5s 75s 750s 1500s |
117 | * F | 8s 80s 800s 1600s | 117 | * F | 8s 80s 800s 1600s |
118 | * | 118 | * |
119 | * Another way to say the same things is: | 119 | * Another way to say the same things is: |
120 | * For N=1, Timeout = (M+1) * 0.5s | 120 | * For N=1, Timeout = (M+1) * 0.5s |
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c index 79906255eeb6..d5d399464599 100644 --- a/drivers/watchdog/sbc_fitpc2_wdt.c +++ b/drivers/watchdog/sbc_fitpc2_wdt.c | |||
@@ -41,7 +41,7 @@ static DEFINE_MUTEX(wdt_lock); | |||
41 | #define IFACE_ON_COMMAND 1 | 41 | #define IFACE_ON_COMMAND 1 |
42 | #define REBOOT_COMMAND 2 | 42 | #define REBOOT_COMMAND 2 |
43 | 43 | ||
44 | #define WATCHDOG_NAME "SBC-FITPC2 Watchdog" | 44 | #define WATCHDOG_NAME "SBC-FITPC2 Watchdog" |
45 | 45 | ||
46 | static void wdt_send_data(unsigned char command, unsigned char data) | 46 | static void wdt_send_data(unsigned char command, unsigned char data) |
47 | { | 47 | { |
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c index 8a1f0bc3e271..df88cfa05f35 100644 --- a/drivers/watchdog/smsc37b787_wdt.c +++ b/drivers/watchdog/smsc37b787_wdt.c | |||
@@ -434,11 +434,11 @@ static long wb_smsc_wdt_ioctl(struct file *file, | |||
434 | } uarg; | 434 | } uarg; |
435 | 435 | ||
436 | static const struct watchdog_info ident = { | 436 | static const struct watchdog_info ident = { |
437 | .options = WDIOF_KEEPALIVEPING | | 437 | .options = WDIOF_KEEPALIVEPING | |
438 | WDIOF_SETTIMEOUT | | 438 | WDIOF_SETTIMEOUT | |
439 | WDIOF_MAGICCLOSE, | 439 | WDIOF_MAGICCLOSE, |
440 | .firmware_version = 0, | 440 | .firmware_version = 0, |
441 | .identity = "SMsC 37B787 Watchdog", | 441 | .identity = "SMsC 37B787 Watchdog", |
442 | }; | 442 | }; |
443 | 443 | ||
444 | uarg.i = (int __user *)arg; | 444 | uarg.i = (int __user *)arg; |
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c index 833f49f43d43..100b114e3c3c 100644 --- a/drivers/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c | |||
@@ -151,7 +151,7 @@ static int softdog_release(struct inode *inode, struct file *file) | |||
151 | { | 151 | { |
152 | /* | 152 | /* |
153 | * Shut off the timer. | 153 | * Shut off the timer. |
154 | * Lock it in if it's a module and we set nowayout | 154 | * Lock it in if it's a module and we set nowayout |
155 | */ | 155 | */ |
156 | if (expect_close == 42) { | 156 | if (expect_close == 42) { |
157 | softdog_stop(); | 157 | softdog_stop(); |
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c index 18cdeb4c4258..5a90a4a871dd 100644 --- a/drivers/watchdog/ts72xx_wdt.c +++ b/drivers/watchdog/ts72xx_wdt.c | |||
@@ -68,7 +68,7 @@ struct platform_device *ts72xx_wdt_pdev; | |||
68 | * to control register): | 68 | * to control register): |
69 | * value description | 69 | * value description |
70 | * ------------------------- | 70 | * ------------------------- |
71 | * 0x00 watchdog disabled | 71 | * 0x00 watchdog disabled |
72 | * 0x01 250ms | 72 | * 0x01 250ms |
73 | * 0x02 500ms | 73 | * 0x02 500ms |
74 | * 0x03 1s | 74 | * 0x03 1s |
diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c index df2a64dc9672..be9c4d839e15 100644 --- a/drivers/watchdog/w83697ug_wdt.c +++ b/drivers/watchdog/w83697ug_wdt.c | |||
@@ -87,10 +87,10 @@ static int w83697ug_select_wd_register(void) | |||
87 | outb_p(0x87, WDT_EFER); /* Enter extended function mode */ | 87 | outb_p(0x87, WDT_EFER); /* Enter extended function mode */ |
88 | outb_p(0x87, WDT_EFER); /* Again according to manual */ | 88 | outb_p(0x87, WDT_EFER); /* Again according to manual */ |
89 | 89 | ||
90 | outb(0x20, WDT_EFER); /* check chip version */ | 90 | outb(0x20, WDT_EFER); /* check chip version */ |
91 | version = inb(WDT_EFDR); | 91 | version = inb(WDT_EFDR); |
92 | 92 | ||
93 | if (version == 0x68) { /* W83697UG */ | 93 | if (version == 0x68) { /* W83697UG */ |
94 | printk(KERN_INFO PFX "Watchdog chip version 0x%02x = " | 94 | printk(KERN_INFO PFX "Watchdog chip version 0x%02x = " |
95 | "W83697UG/UF found at 0x%04x\n", version, wdt_io); | 95 | "W83697UG/UF found at 0x%04x\n", version, wdt_io); |
96 | 96 | ||
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c index 552a4381e78f..bb03e151a1d0 100644 --- a/drivers/watchdog/wdt.c +++ b/drivers/watchdog/wdt.c | |||
@@ -581,7 +581,7 @@ static void __exit wdt_exit(void) | |||
581 | } | 581 | } |
582 | 582 | ||
583 | /** | 583 | /** |
584 | * wdt_init: | 584 | * wdt_init: |
585 | * | 585 | * |
586 | * Set up the WDT watchdog board. All we have to do is grab the | 586 | * Set up the WDT watchdog board. All we have to do is grab the |
587 | * resources we require and bitch if anyone beat us to them. | 587 | * resources we require and bitch if anyone beat us to them. |
diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c index 5c2521fc836c..a2f01c9f5c34 100644 --- a/drivers/watchdog/wdt977.c +++ b/drivers/watchdog/wdt977.c | |||
@@ -281,7 +281,7 @@ static int wdt977_release(struct inode *inode, struct file *file) | |||
281 | { | 281 | { |
282 | /* | 282 | /* |
283 | * Shut off the timer. | 283 | * Shut off the timer. |
284 | * Lock it in if it's a module and we set nowayout | 284 | * Lock it in if it's a module and we set nowayout |
285 | */ | 285 | */ |
286 | if (expect_close == 42) { | 286 | if (expect_close == 42) { |
287 | wdt977_stop(); | 287 | wdt977_stop(); |
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 97bb6fbdcf56..172dad6c7693 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c | |||
@@ -31,7 +31,7 @@ | |||
31 | * Jeff Garzik : PCI cleanups | 31 | * Jeff Garzik : PCI cleanups |
32 | * Tigran Aivazian : Restructured wdtpci_init_one() to handle | 32 | * Tigran Aivazian : Restructured wdtpci_init_one() to handle |
33 | * failures | 33 | * failures |
34 | * Joel Becker : Added WDIOC_GET/SETTIMEOUT | 34 | * Joel Becker : Added WDIOC_GET/SETTIMEOUT |
35 | * Zwane Mwaikambo : Magic char closing, locking changes, | 35 | * Zwane Mwaikambo : Magic char closing, locking changes, |
36 | * cleanups | 36 | * cleanups |
37 | * Matt Domsch : nowayout module option | 37 | * Matt Domsch : nowayout module option |
@@ -764,7 +764,7 @@ static void __exit wdtpci_cleanup(void) | |||
764 | 764 | ||
765 | 765 | ||
766 | /** | 766 | /** |
767 | * wdtpci_init: | 767 | * wdtpci_init: |
768 | * | 768 | * |
769 | * Set up the WDT watchdog board. All we have to do is grab the | 769 | * Set up the WDT watchdog board. All we have to do is grab the |
770 | * resources we require and bitch if anyone beat us to them. | 770 | * resources we require and bitch if anyone beat us to them. |