diff options
Diffstat (limited to 'drivers/edac/edac_module.c')
-rw-r--r-- | drivers/edac/edac_module.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/edac/edac_module.c b/drivers/edac/edac_module.c index 38e4a71380aa..687d2ef2bbed 100644 --- a/drivers/edac/edac_module.c +++ b/drivers/edac/edac_module.c | |||
@@ -37,7 +37,7 @@ static int edac_class_valid = 0; | |||
37 | /* | 37 | /* |
38 | * edac_op_state_toString() | 38 | * edac_op_state_toString() |
39 | */ | 39 | */ |
40 | char * edac_op_state_toString(int opstate) | 40 | char *edac_op_state_toString(int opstate) |
41 | { | 41 | { |
42 | if (opstate == OP_RUNNING_POLL) | 42 | if (opstate == OP_RUNNING_POLL) |
43 | return "POLLED"; | 43 | return "POLLED"; |
@@ -60,7 +60,7 @@ char * edac_op_state_toString(int opstate) | |||
60 | */ | 60 | */ |
61 | struct sysdev_class *edac_get_edac_class(void) | 61 | struct sysdev_class *edac_get_edac_class(void) |
62 | { | 62 | { |
63 | struct sysdev_class *classptr=NULL; | 63 | struct sysdev_class *classptr = NULL; |
64 | 64 | ||
65 | if (edac_class_valid) | 65 | if (edac_class_valid) |
66 | classptr = &edac_class; | 66 | classptr = &edac_class; |
@@ -133,7 +133,6 @@ static void edac_workqueue_teardown(void) | |||
133 | } | 133 | } |
134 | } | 134 | } |
135 | 135 | ||
136 | |||
137 | /* | 136 | /* |
138 | * edac_init | 137 | * edac_init |
139 | * module initialization entry point | 138 | * module initialization entry point |
@@ -148,8 +147,8 @@ static int __init edac_init(void) | |||
148 | * Harvest and clear any boot/initialization PCI parity errors | 147 | * Harvest and clear any boot/initialization PCI parity errors |
149 | * | 148 | * |
150 | * FIXME: This only clears errors logged by devices present at time of | 149 | * FIXME: This only clears errors logged by devices present at time of |
151 | * module initialization. We should also do an initial clear | 150 | * module initialization. We should also do an initial clear |
152 | * of each newly hotplugged device. | 151 | * of each newly hotplugged device. |
153 | */ | 152 | */ |
154 | edac_pci_clear_parity_errors(); | 153 | edac_pci_clear_parity_errors(); |
155 | 154 | ||
@@ -158,7 +157,7 @@ static int __init edac_init(void) | |||
158 | */ | 157 | */ |
159 | if (edac_register_sysfs_edac_name()) { | 158 | if (edac_register_sysfs_edac_name()) { |
160 | edac_printk(KERN_ERR, EDAC_MC, | 159 | edac_printk(KERN_ERR, EDAC_MC, |
161 | "Error initializing 'edac' kobject\n"); | 160 | "Error initializing 'edac' kobject\n"); |
162 | err = -ENODEV; | 161 | err = -ENODEV; |
163 | goto error; | 162 | goto error; |
164 | } | 163 | } |
@@ -167,7 +166,7 @@ static int __init edac_init(void) | |||
167 | */ | 166 | */ |
168 | if (edac_sysfs_memctrl_setup()) { | 167 | if (edac_sysfs_memctrl_setup()) { |
169 | edac_printk(KERN_ERR, EDAC_MC, | 168 | edac_printk(KERN_ERR, EDAC_MC, |
170 | "Error initializing sysfs code\n"); | 169 | "Error initializing sysfs code\n"); |
171 | err = -ENODEV; | 170 | err = -ENODEV; |
172 | goto error_sysfs; | 171 | goto error_sysfs; |
173 | } | 172 | } |
@@ -182,11 +181,11 @@ static int __init edac_init(void) | |||
182 | return 0; | 181 | return 0; |
183 | 182 | ||
184 | /* Error teardown stack */ | 183 | /* Error teardown stack */ |
185 | error_mem: | 184 | error_mem: |
186 | edac_sysfs_memctrl_teardown(); | 185 | edac_sysfs_memctrl_teardown(); |
187 | error_sysfs: | 186 | error_sysfs: |
188 | edac_unregister_sysfs_edac_name(); | 187 | edac_unregister_sysfs_edac_name(); |
189 | error: | 188 | error: |
190 | return err; | 189 | return err; |
191 | } | 190 | } |
192 | 191 | ||
@@ -198,7 +197,7 @@ static void __exit edac_exit(void) | |||
198 | { | 197 | { |
199 | debugf0("%s()\n", __func__); | 198 | debugf0("%s()\n", __func__); |
200 | 199 | ||
201 | /* tear down the various subsystems*/ | 200 | /* tear down the various subsystems */ |
202 | edac_workqueue_teardown(); | 201 | edac_workqueue_teardown(); |
203 | edac_sysfs_memctrl_teardown(); | 202 | edac_sysfs_memctrl_teardown(); |
204 | edac_unregister_sysfs_edac_name(); | 203 | edac_unregister_sysfs_edac_name(); |
@@ -220,4 +219,3 @@ MODULE_DESCRIPTION("Core library routines for EDAC reporting"); | |||
220 | module_param(edac_debug_level, int, 0644); | 219 | module_param(edac_debug_level, int, 0644); |
221 | MODULE_PARM_DESC(edac_debug_level, "Debug level"); | 220 | MODULE_PARM_DESC(edac_debug_level, "Debug level"); |
222 | #endif | 221 | #endif |
223 | |||