diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2008-08-06 16:19:41 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2008-08-06 16:19:41 -0400 |
commit | 7944d3a5a70ee5c1904ed1e8b1d71ff0af2854d9 (patch) | |
tree | fe6ec1a557a4b27712266d9d86f791c69e8e2596 /drivers/watchdog/ixp4xx_wdt.c | |
parent | 12b7a1523eda9cd72362fdda928ddb995ecdc06d (diff) |
[WATCHDOG] more coding style clean-up's
More coding style clean-up's.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/ixp4xx_wdt.c')
-rw-r--r-- | drivers/watchdog/ixp4xx_wdt.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c index b94713e4773d..ef3157dc9ac1 100644 --- a/drivers/watchdog/ixp4xx_wdt.c +++ b/drivers/watchdog/ixp4xx_wdt.c | |||
@@ -157,8 +157,7 @@ static int ixp4xx_wdt_release(struct inode *inode, struct file *file) | |||
157 | } | 157 | } |
158 | 158 | ||
159 | 159 | ||
160 | static const struct file_operations ixp4xx_wdt_fops = | 160 | static const struct file_operations ixp4xx_wdt_fops = { |
161 | { | ||
162 | .owner = THIS_MODULE, | 161 | .owner = THIS_MODULE, |
163 | .llseek = no_llseek, | 162 | .llseek = no_llseek, |
164 | .write = ixp4xx_wdt_write, | 163 | .write = ixp4xx_wdt_write, |
@@ -167,8 +166,7 @@ static const struct file_operations ixp4xx_wdt_fops = | |||
167 | .release = ixp4xx_wdt_release, | 166 | .release = ixp4xx_wdt_release, |
168 | }; | 167 | }; |
169 | 168 | ||
170 | static struct miscdevice ixp4xx_wdt_miscdev = | 169 | static struct miscdevice ixp4xx_wdt_miscdev = { |
171 | { | ||
172 | .minor = WATCHDOG_MINOR, | 170 | .minor = WATCHDOG_MINOR, |
173 | .name = "watchdog", | 171 | .name = "watchdog", |
174 | .fops = &ixp4xx_wdt_fops, | 172 | .fops = &ixp4xx_wdt_fops, |
@@ -181,8 +179,8 @@ static int __init ixp4xx_wdt_init(void) | |||
181 | 179 | ||
182 | asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :); | 180 | asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :); |
183 | if (!(processor_id & 0xf) && !cpu_is_ixp46x()) { | 181 | if (!(processor_id & 0xf) && !cpu_is_ixp46x()) { |
184 | printk("IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected - " | 182 | printk(KERN_ERR "IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected" |
185 | "watchdog disabled\n"); | 183 | " - watchdog disabled\n"); |
186 | 184 | ||
187 | return -ENODEV; | 185 | return -ENODEV; |
188 | } | 186 | } |
@@ -191,7 +189,8 @@ static int __init ixp4xx_wdt_init(void) | |||
191 | WDIOF_CARDRESET : 0; | 189 | WDIOF_CARDRESET : 0; |
192 | ret = misc_register(&ixp4xx_wdt_miscdev); | 190 | ret = misc_register(&ixp4xx_wdt_miscdev); |
193 | if (ret == 0) | 191 | if (ret == 0) |
194 | printk("IXP4xx Watchdog Timer: heartbeat %d sec\n", heartbeat); | 192 | printk(KERN_INFO "IXP4xx Watchdog Timer: heartbeat %d sec\n", |
193 | heartbeat); | ||
195 | return ret; | 194 | return ret; |
196 | } | 195 | } |
197 | 196 | ||