Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5f3b27569fc0286a51f8d0655c7fb4f5b36aea65

Authored by Wim Van Sebroeck
1 parent 4562f53940
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

watchdog: cleanup spaces before tabs 

cleanup spaces before tabs in drivers/watchdog/

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Showing 26 changed files with 63 additions and 63 deletions Side-by-side Diff

drivers/watchdog/alim1535_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -362,12 +362,12 @@
362 362 */
363 363  
364 364 static const struct file_operations ali_fops = {
365   - .owner = THIS_MODULE,
366   - .llseek = no_llseek,
  365 + .owner = THIS_MODULE,
  366 + .llseek = no_llseek,
367 367 .write = ali_write,
368 368 .unlocked_ioctl = ali_ioctl,
369   - .open = ali_open,
370   - .release = ali_release,
  369 + .open = ali_open,
  370 + .release = ali_release,
371 371 };
372 372  
373 373 static struct miscdevice ali_miscdev = {
drivers/watchdog/bcm47xx_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -150,8 +150,8 @@
150 150 }
151 151  
152 152 static const struct watchdog_info bcm47xx_wdt_info = {
153   - .identity = DRV_NAME,
154   - .options = WDIOF_SETTIMEOUT |
  153 + .identity = DRV_NAME,
  154 + .options = WDIOF_SETTIMEOUT |
155 155 WDIOF_KEEPALIVEPING |
156 156 WDIOF_MAGICCLOSE,
157 157 };
drivers/watchdog/bfin_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -63,7 +63,7 @@
63 63 /**
64 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 68 static int bfin_wdt_keepalive(void)
69 69 {
... ... @@ -337,7 +337,7 @@
337 337 static const struct file_operations bfin_wdt_fops = {
338 338 .owner = THIS_MODULE,
339 339 .llseek = no_llseek,
340   - .write = bfin_wdt_write,
  340 + .write = bfin_wdt_write,
341 341 .unlocked_ioctl = bfin_wdt_ioctl,
342 342 .open = bfin_wdt_open,
343 343 .release = bfin_wdt_release,
drivers/watchdog/cpwd.c
Diff comments   View file @ 5f3b275
... ... @@ -5,10 +5,10 @@
5 5 * interface and Solaris-compatible ioctls as best it is
6 6 * able.
7 7 *
8   - * NOTE: CP1400 systems appear to have a defective intr_mask
9   - * register on the PLD, preventing the disabling of
10   - * timer interrupts. We use a timer to periodically
11   - * reset 'stopped' watchdogs on affected platforms.
  8 + * NOTE: CP1400 systems appear to have a defective intr_mask
  9 + * register on the PLD, preventing the disabling of
  10 + * timer interrupts. We use a timer to periodically
  11 + * reset 'stopped' watchdogs on affected platforms.
12 12 *
13 13 * Copyright (c) 2000 Eric Brower (ebrower@usa.net)
14 14 * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
... ... @@ -107,13 +107,13 @@
107 107 * -------------------
108 108 * |- counter val -|
109 109 * -------------------
110   - * dcntr - Current 16-bit downcounter value.
111   - * When downcounter reaches '0' watchdog expires.
112   - * Reading this register resets downcounter with
113   - * 'limit' value.
114   - * limit - 16-bit countdown value in 1/10th second increments.
115   - * Writing this register begins countdown with input value.
116   - * Reading from this register does not affect counter.
  110 + * dcntr - Current 16-bit downcounter value.
  111 + * When downcounter reaches '0' watchdog expires.
  112 + * Reading this register resets downcounter with
  113 + * 'limit' value.
  114 + * limit - 16-bit countdown value in 1/10th second increments.
  115 + * Writing this register begins countdown with input value.
  116 + * Reading from this register does not affect counter.
117 117 * NOTES: After watchdog reset, dcntr and limit contain '1'
118 118 *
119 119 * status register (byte access):
... ... @@ -123,7 +123,7 @@
123 123 * |- UNUSED -| EXP | RUN |
124 124 * ---------------------------
125 125 * status- Bit 0 - Watchdog is running
126   - * Bit 1 - Watchdog has expired
  126 + * Bit 1 - Watchdog has expired
127 127 *
128 128 *** PLD register block definition (struct wd_pld_regblk)
129 129 *
... ... @@ -197,7 +197,7 @@
197 197 * Because of the CP1400 defect this should only be
198 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 201 * enable - non-zero to enable interrupts, zero to disable
202 202 */
203 203 static void cpwd_toggleintr(struct cpwd *p, int index, int enable)
204 204  
... ... @@ -317,13 +317,13 @@
317 317 } else {
318 318 /* Fudge WD_EXPIRED status for defective CP1400--
319 319 * IF timer is running
320   - * AND brokenstop is set
321   - * AND an interrupt has been serviced
  320 + * AND brokenstop is set
  321 + * AND an interrupt has been serviced
322 322 * we are WD_EXPIRED.
323 323 *
324 324 * IF timer is running
325   - * AND brokenstop is set
326   - * AND no interrupt has been serviced
  325 + * AND brokenstop is set
  326 + * AND no interrupt has been serviced
327 327 * we are WD_FREERUN.
328 328 */
329 329 if (p->broken &&
... ... @@ -614,7 +614,7 @@
614 614  
615 615 if (p->broken) {
616 616 init_timer(&cpwd_timer);
617   - cpwd_timer.function = cpwd_brokentimer;
  617 + cpwd_timer.function = cpwd_brokentimer;
618 618 cpwd_timer.data = (unsigned long) p;
619 619 cpwd_timer.expires = WD_BTIMEOUT;
620 620  
drivers/watchdog/eurotechwdt.c
Diff comments   View file @ 5f3b275
... ... @@ -201,7 +201,7 @@
201 201 static ssize_t eurwdt_write(struct file *file, const char __user *buf,
202 202 size_t count, loff_t *ppos)
203 203 {
204   - if (count) {
  204 + if (count) {
205 205 if (!nowayout) {
206 206 size_t i;
207 207  
drivers/watchdog/iTCO_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -247,7 +247,7 @@
247 247 {NULL, 0}
248 248 };
249 249  
250   -#define ITCO_PCI_DEVICE(dev, data) \
  250 +#define ITCO_PCI_DEVICE(dev, data) \
251 251 .vendor = PCI_VENDOR_ID_INTEL, \
252 252 .device = dev, \
253 253 .subvendor = PCI_ANY_ID, \
drivers/watchdog/it8712f_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -69,7 +69,7 @@
69 69 #define IT8712F_DEVID 0x8712
70 70  
71 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 74 #define WDT_CONTROL 0x71 /* WDT Register: Control */
75 75 #define WDT_CONFIG 0x72 /* WDT Register: Configuration */
drivers/watchdog/it87_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -54,7 +54,7 @@
54 54 /* Defaults for Module Parameter */
55 55 #define DEFAULT_NOGAMEPORT 0
56 56 #define DEFAULT_EXCLUSIVE 1
57   -#define DEFAULT_TIMEOUT 60
  57 +#define DEFAULT_TIMEOUT 60
58 58 #define DEFAULT_TESTMODE 0
59 59 #define DEFAULT_NOWAYOUT WATCHDOG_NOWAYOUT
60 60  
61 61  
... ... @@ -70,9 +70,9 @@
70 70 /* Configuration Registers and Functions */
71 71 #define LDNREG 0x07
72 72 #define CHIPID 0x20
73   -#define CHIPREV 0x22
  73 +#define CHIPREV 0x22
74 74 #define ACTREG 0x30
75   -#define BASEREG 0x60
  75 +#define BASEREG 0x60
76 76  
77 77 /* Chip Id numbers */
78 78 #define NO_DEV_ID 0xffff
... ... @@ -86,7 +86,7 @@
86 86 #define IT8726_ID 0x8726 /* the data sheet suggest wrongly 0x8716 */
87 87  
88 88 /* GPIO Configuration Registers LDN=0x07 */
89   -#define WDTCTRL 0x71
  89 +#define WDTCTRL 0x71
90 90 #define WDTCFG 0x72
91 91 #define WDTVALLSB 0x73
92 92 #define WDTVALMSB 0x74
... ... @@ -107,7 +107,7 @@
107 107 #define WDT_INT_MASK 0x0f
108 108  
109 109 /* CIR Configuration Register LDN=0x0a */
110   -#define CIR_ILS 0x70
  110 +#define CIR_ILS 0x70
111 111  
112 112 /* The default Base address is not always available, we use this */
113 113 #define CIR_BASE 0x0208
drivers/watchdog/machzwd.c
Diff comments   View file @ 5f3b275
... ... @@ -54,7 +54,7 @@
54 54  
55 55 /* indexes */ /* size */
56 56 #define ZFL_VERSION 0x02 /* 16 */
57   -#define CONTROL 0x10 /* 16 */
  57 +#define CONTROL 0x10 /* 16 */
58 58 #define STATUS 0x12 /* 8 */
59 59 #define COUNTER_1 0x0C /* 16 */
60 60 #define COUNTER_2 0x0E /* 8 */
drivers/watchdog/max63xx_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -41,7 +41,7 @@
41 41 * to ping the watchdog.
42 42 */
43 43 #define MAX6369_WDSET (7 << 0)
44   -#define MAX6369_WDI (1 << 3)
  44 +#define MAX6369_WDI (1 << 3)
45 45  
46 46 static DEFINE_SPINLOCK(io_lock);
47 47  
drivers/watchdog/mpc8xxx_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -2,9 +2,9 @@
2 2 * mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface
3 3 *
4 4 * Authors: Dave Updegraff <dave@cray.org>
5   - * Kumar Gala <galak@kernel.crashing.org>
6   - * Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org>
7   - * ..and from sc520_wdt
  5 + * Kumar Gala <galak@kernel.crashing.org>
  6 + * Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org>
  7 + * ..and from sc520_wdt
8 8 * Copyright (c) 2008 MontaVista Software, Inc.
9 9 * Anton Vorontsov <avorontsov@ru.mvista.com>
10 10 *
drivers/watchdog/mpcore_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -172,7 +172,7 @@
172 172  
173 173 /*
174 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 177 if (wdt->expect_close == 42)
178 178 mpcore_wdt_stop(wdt);
drivers/watchdog/mtx-1_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -190,19 +190,19 @@
190 190 }
191 191  
192 192 static const struct file_operations mtx1_wdt_fops = {
193   - .owner = THIS_MODULE,
  193 + .owner = THIS_MODULE,
194 194 .llseek = no_llseek,
195 195 .unlocked_ioctl = mtx1_wdt_ioctl,
196   - .open = mtx1_wdt_open,
197   - .write = mtx1_wdt_write,
198   - .release = mtx1_wdt_release,
  196 + .open = mtx1_wdt_open,
  197 + .write = mtx1_wdt_write,
  198 + .release = mtx1_wdt_release,
199 199 };
200 200  
201 201  
202 202 static struct miscdevice mtx1_wdt_misc = {
203   - .minor = WATCHDOG_MINOR,
204   - .name = "watchdog",
205   - .fops = &mtx1_wdt_fops,
  203 + .minor = WATCHDOG_MINOR,
  204 + .name = "watchdog",
  205 + .fops = &mtx1_wdt_fops,
206 206 };
207 207  
208 208  
drivers/watchdog/omap_wdt.h
Diff comments   View file @ 5f3b275
... ... @@ -44,7 +44,7 @@
44 44 * months before firing. These limits work without scaling,
45 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 48 #define TIMER_MARGIN_DEFAULT 60 /* 60 secs */
49 49 #define TIMER_MARGIN_MIN 1
50 50  
drivers/watchdog/pc87413_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -514,7 +514,7 @@
514 514 /* -- Module init functions -------------------------------------*/
515 515  
516 516 /**
517   - * pc87413_init: module's "constructor"
  517 + * pc87413_init: module's "constructor"
518 518 *
519 519 * Set up the WDT watchdog board. All we have to do is grab the
520 520 * resources we require and bitch if anyone beat us to them.
drivers/watchdog/pnx4008_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -4,7 +4,7 @@
4 4 * Watchdog driver for PNX4008 board
5 5 *
6 6 * Authors: Dmitry Chigirev <source@mvista.com>,
7   - * Vitaly Wool <vitalywool@gmail.com>
  7 + * Vitaly Wool <vitalywool@gmail.com>
8 8 * Based on sa1100 driver,
9 9 * Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
10 10 *
drivers/watchdog/s3c2410_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -224,7 +224,7 @@
224 224 {
225 225 /*
226 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 230 if (expect_close == 42)
drivers/watchdog/sbc8360.c
Diff comments   View file @ 5f3b275
... ... @@ -114,7 +114,7 @@
114 114 * C | 6.5s 65s 650s 1300s
115 115 * D | 7s 70s 700s 1400s
116 116 * E | 7.5s 75s 750s 1500s
117   - * F | 8s 80s 800s 1600s
  117 + * F | 8s 80s 800s 1600s
118 118 *
119 119 * Another way to say the same things is:
120 120 * For N=1, Timeout = (M+1) * 0.5s
drivers/watchdog/sbc_fitpc2_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -41,7 +41,7 @@
41 41 #define IFACE_ON_COMMAND 1
42 42 #define REBOOT_COMMAND 2
43 43  
44   -#define WATCHDOG_NAME "SBC-FITPC2 Watchdog"
  44 +#define WATCHDOG_NAME "SBC-FITPC2 Watchdog"
45 45  
46 46 static void wdt_send_data(unsigned char command, unsigned char data)
47 47 {
drivers/watchdog/smsc37b787_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -434,11 +434,11 @@
434 434 } uarg;
435 435  
436 436 static const struct watchdog_info ident = {
437   - .options = WDIOF_KEEPALIVEPING |
  437 + .options = WDIOF_KEEPALIVEPING |
438 438 WDIOF_SETTIMEOUT |
439 439 WDIOF_MAGICCLOSE,
440 440 .firmware_version = 0,
441   - .identity = "SMsC 37B787 Watchdog",
  441 + .identity = "SMsC 37B787 Watchdog",
442 442 };
443 443  
444 444 uarg.i = (int __user *)arg;
drivers/watchdog/softdog.c
Diff comments   View file @ 5f3b275
... ... @@ -151,7 +151,7 @@
151 151 {
152 152 /*
153 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 156 if (expect_close == 42) {
157 157 softdog_stop();
drivers/watchdog/ts72xx_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -68,7 +68,7 @@
68 68 * to control register):
69 69 * value description
70 70 * -------------------------
71   - * 0x00 watchdog disabled
  71 + * 0x00 watchdog disabled
72 72 * 0x01 250ms
73 73 * 0x02 500ms
74 74 * 0x03 1s
drivers/watchdog/w83697ug_wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -87,10 +87,10 @@
87 87 outb_p(0x87, WDT_EFER); /* Enter extended function mode */
88 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 91 version = inb(WDT_EFDR);
92 92  
93   - if (version == 0x68) { /* W83697UG */
  93 + if (version == 0x68) { /* W83697UG */
94 94 printk(KERN_INFO PFX "Watchdog chip version 0x%02x = "
95 95 "W83697UG/UF found at 0x%04x\n", version, wdt_io);
96 96  
drivers/watchdog/wdt.c
Diff comments   View file @ 5f3b275
... ... @@ -581,7 +581,7 @@
581 581 }
582 582  
583 583 /**
584   - * wdt_init:
  584 + * wdt_init:
585 585 *
586 586 * Set up the WDT watchdog board. All we have to do is grab the
587 587 * resources we require and bitch if anyone beat us to them.
drivers/watchdog/wdt977.c
Diff comments   View file @ 5f3b275
... ... @@ -281,7 +281,7 @@
281 281 {
282 282 /*
283 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 286 if (expect_close == 42) {
287 287 wdt977_stop();
drivers/watchdog/wdt_pci.c
Diff comments   View file @ 5f3b275
... ... @@ -31,7 +31,7 @@
31 31 * Jeff Garzik : PCI cleanups
32 32 * Tigran Aivazian : Restructured wdtpci_init_one() to handle
33 33 * failures
34   - * Joel Becker : Added WDIOC_GET/SETTIMEOUT
  34 + * Joel Becker : Added WDIOC_GET/SETTIMEOUT
35 35 * Zwane Mwaikambo : Magic char closing, locking changes,
36 36 * cleanups
37 37 * Matt Domsch : nowayout module option
... ... @@ -764,7 +764,7 @@
764 764  
765 765  
766 766 /**
767   - * wdtpci_init:
  767 + * wdtpci_init:
768 768 *
769 769 * Set up the WDT watchdog board. All we have to do is grab the
770 770 * resources we require and bitch if anyone beat us to them.