diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2006-11-17 15:51:35 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2006-11-17 15:51:35 -0500 |
commit | cd57eeab7c4c108ce6e84545bdf37ae91b930781 (patch) | |
tree | d71510ce0b6ec0c0250ce802fda0b23775314ded /drivers/char | |
parent | 825d3748c1b5f9272e4f9769f1c2da85174ece28 (diff) |
[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 1
Locate parameter descriptions close to parameter definition -
not in bottom of file.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/watchdog/rm9k_wdt.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/char/watchdog/rm9k_wdt.c b/drivers/char/watchdog/rm9k_wdt.c index 8cd12ab9bff4..da3fc63bca61 100644 --- a/drivers/char/watchdog/rm9k_wdt.c +++ b/drivers/char/watchdog/rm9k_wdt.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #define CPGIG1ER 0x0054 | 45 | #define CPGIG1ER 0x0054 |
46 | 46 | ||
47 | 47 | ||
48 | |||
49 | /* Function prototypes */ | 48 | /* Function prototypes */ |
50 | static int __init wdt_gpi_probe(struct device *); | 49 | static int __init wdt_gpi_probe(struct device *); |
51 | static int __exit wdt_gpi_remove(struct device *); | 50 | static int __exit wdt_gpi_remove(struct device *); |
@@ -59,33 +58,37 @@ static int wdt_gpi_notify(struct notifier_block *, unsigned long, void *); | |||
59 | static irqreturn_t wdt_gpi_irqhdl(int, void *, struct pt_regs *); | 58 | static irqreturn_t wdt_gpi_irqhdl(int, void *, struct pt_regs *); |
60 | 59 | ||
61 | 60 | ||
62 | |||
63 | |||
64 | static const char wdt_gpi_name[] = "wdt_gpi"; | 61 | static const char wdt_gpi_name[] = "wdt_gpi"; |
65 | static atomic_t opencnt; | 62 | static atomic_t opencnt; |
66 | static int expect_close; | 63 | static int expect_close; |
67 | static int locked = 0; | 64 | static int locked = 0; |
68 | 65 | ||
69 | 66 | ||
70 | |||
71 | /* These are set from device resources */ | 67 | /* These are set from device resources */ |
72 | static void __iomem * wd_regs; | 68 | static void __iomem * wd_regs; |
73 | static unsigned int wd_irq, wd_ctr; | 69 | static unsigned int wd_irq, wd_ctr; |
74 | 70 | ||
75 | 71 | ||
76 | |||
77 | /* Module arguments */ | 72 | /* Module arguments */ |
78 | static int timeout = MAX_TIMEOUT_SECONDS; | 73 | static int timeout = MAX_TIMEOUT_SECONDS; |
79 | module_param(timeout, int, 0444); | 74 | module_param(timeout, int, 0444); |
75 | MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds"); | ||
76 | |||
80 | static unsigned long resetaddr = 0xbffdc200; | 77 | static unsigned long resetaddr = 0xbffdc200; |
81 | module_param(resetaddr, ulong, 0444); | 78 | module_param(resetaddr, ulong, 0444); |
79 | MODULE_PARM_DESC(resetaddr, "Address to write to to force a reset"); | ||
80 | |||
82 | static unsigned long flagaddr = 0xbffdc104; | 81 | static unsigned long flagaddr = 0xbffdc104; |
83 | module_param(flagaddr, ulong, 0444); | 82 | module_param(flagaddr, ulong, 0444); |
83 | MODULE_PARM_DESC(flagaddr, "Address to write to boot flags to"); | ||
84 | |||
84 | static int powercycle = 0; | 85 | static int powercycle = 0; |
85 | module_param(powercycle, bool, 0444); | 86 | module_param(powercycle, bool, 0444); |
87 | MODULE_PARM_DESC(powercycle, "Cycle power if watchdog expires"); | ||
86 | 88 | ||
87 | static int nowayout = WATCHDOG_NOWAYOUT; | 89 | static int nowayout = WATCHDOG_NOWAYOUT; |
88 | module_param(nowayout, bool, 0444); | 90 | module_param(nowayout, bool, 0444); |
91 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started"); | ||
89 | 92 | ||
90 | 93 | ||
91 | 94 | ||
@@ -424,8 +427,4 @@ MODULE_DESCRIPTION("Basler eXcite watchdog driver for gpi devices"); | |||
424 | MODULE_VERSION("0.1"); | 427 | MODULE_VERSION("0.1"); |
425 | MODULE_LICENSE("GPL"); | 428 | MODULE_LICENSE("GPL"); |
426 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 429 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
427 | MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds"); | 430 | |
428 | MODULE_PARM_DESC(resetaddr, "Address to write to to force a reset"); | ||
429 | MODULE_PARM_DESC(flagaddr, "Address to write to boot flags to"); | ||
430 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started"); | ||
431 | MODULE_PARM_DESC(powercycle, "Cycle power if watchdog expires"); | ||