diff options
Diffstat (limited to 'drivers/edac/edac_module.c')
| -rw-r--r-- | drivers/edac/edac_module.c | 79 |
1 files changed, 1 insertions, 78 deletions
diff --git a/drivers/edac/edac_module.c b/drivers/edac/edac_module.c index 7e1374afd967..be4b075c3098 100644 --- a/drivers/edac/edac_module.c +++ b/drivers/edac/edac_module.c | |||
| @@ -27,15 +27,6 @@ EXPORT_SYMBOL_GPL(edac_debug_level); | |||
| 27 | struct workqueue_struct *edac_workqueue; | 27 | struct workqueue_struct *edac_workqueue; |
| 28 | 28 | ||
| 29 | /* | 29 | /* |
| 30 | * sysfs object: /sys/devices/system/edac | ||
| 31 | * need to export to other files in this modules | ||
| 32 | */ | ||
| 33 | static struct sysdev_class edac_class = { | ||
| 34 | .name = "edac", | ||
| 35 | }; | ||
| 36 | static int edac_class_valid; | ||
| 37 | |||
| 38 | /* | ||
| 39 | * edac_op_state_to_string() | 30 | * edac_op_state_to_string() |
| 40 | */ | 31 | */ |
| 41 | char *edac_op_state_to_string(int opstate) | 32 | char *edac_op_state_to_string(int opstate) |
| @@ -55,60 +46,6 @@ char *edac_op_state_to_string(int opstate) | |||
| 55 | } | 46 | } |
| 56 | 47 | ||
| 57 | /* | 48 | /* |
| 58 | * edac_get_edac_class() | ||
| 59 | * | ||
| 60 | * return pointer to the edac class of 'edac' | ||
| 61 | */ | ||
| 62 | struct sysdev_class *edac_get_edac_class(void) | ||
| 63 | { | ||
| 64 | struct sysdev_class *classptr = NULL; | ||
| 65 | |||
| 66 | if (edac_class_valid) | ||
| 67 | classptr = &edac_class; | ||
| 68 | |||
| 69 | return classptr; | ||
| 70 | } | ||
| 71 | |||
| 72 | /* | ||
| 73 | * edac_register_sysfs_edac_name() | ||
| 74 | * | ||
| 75 | * register the 'edac' into /sys/devices/system | ||
| 76 | * | ||
| 77 | * return: | ||
| 78 | * 0 success | ||
| 79 | * !0 error | ||
| 80 | */ | ||
| 81 | static int edac_register_sysfs_edac_name(void) | ||
| 82 | { | ||
| 83 | int err; | ||
| 84 | |||
| 85 | /* create the /sys/devices/system/edac directory */ | ||
| 86 | err = sysdev_class_register(&edac_class); | ||
| 87 | |||
| 88 | if (err) { | ||
| 89 | debugf1("%s() error=%d\n", __func__, err); | ||
| 90 | return err; | ||
| 91 | } | ||
| 92 | |||
| 93 | edac_class_valid = 1; | ||
| 94 | return 0; | ||
| 95 | } | ||
| 96 | |||
| 97 | /* | ||
| 98 | * sysdev_class_unregister() | ||
| 99 | * | ||
| 100 | * unregister the 'edac' from /sys/devices/system | ||
| 101 | */ | ||
| 102 | static void edac_unregister_sysfs_edac_name(void) | ||
| 103 | { | ||
| 104 | /* only if currently registered, then unregister it */ | ||
| 105 | if (edac_class_valid) | ||
| 106 | sysdev_class_unregister(&edac_class); | ||
| 107 | |||
| 108 | edac_class_valid = 0; | ||
| 109 | } | ||
| 110 | |||
| 111 | /* | ||
| 112 | * edac_workqueue_setup | 49 | * edac_workqueue_setup |
| 113 | * initialize the edac work queue for polling operations | 50 | * initialize the edac work queue for polling operations |
| 114 | */ | 51 | */ |
| @@ -154,21 +91,11 @@ static int __init edac_init(void) | |||
| 154 | edac_pci_clear_parity_errors(); | 91 | edac_pci_clear_parity_errors(); |
| 155 | 92 | ||
| 156 | /* | 93 | /* |
| 157 | * perform the registration of the /sys/devices/system/edac class object | ||
| 158 | */ | ||
| 159 | if (edac_register_sysfs_edac_name()) { | ||
| 160 | edac_printk(KERN_ERR, EDAC_MC, | ||
| 161 | "Error initializing 'edac' kobject\n"); | ||
| 162 | err = -ENODEV; | ||
| 163 | goto error; | ||
| 164 | } | ||
| 165 | |||
| 166 | /* | ||
| 167 | * now set up the mc_kset under the edac class object | 94 | * now set up the mc_kset under the edac class object |
| 168 | */ | 95 | */ |
| 169 | err = edac_sysfs_setup_mc_kset(); | 96 | err = edac_sysfs_setup_mc_kset(); |
| 170 | if (err) | 97 | if (err) |
| 171 | goto sysfs_setup_fail; | 98 | goto error; |
| 172 | 99 | ||
| 173 | /* Setup/Initialize the workq for this core */ | 100 | /* Setup/Initialize the workq for this core */ |
| 174 | err = edac_workqueue_setup(); | 101 | err = edac_workqueue_setup(); |
| @@ -183,9 +110,6 @@ static int __init edac_init(void) | |||
| 183 | workq_fail: | 110 | workq_fail: |
| 184 | edac_sysfs_teardown_mc_kset(); | 111 | edac_sysfs_teardown_mc_kset(); |
| 185 | 112 | ||
| 186 | sysfs_setup_fail: | ||
| 187 | edac_unregister_sysfs_edac_name(); | ||
| 188 | |||
| 189 | error: | 113 | error: |
| 190 | return err; | 114 | return err; |
| 191 | } | 115 | } |
| @@ -201,7 +125,6 @@ static void __exit edac_exit(void) | |||
| 201 | /* tear down the various subsystems */ | 125 | /* tear down the various subsystems */ |
| 202 | edac_workqueue_teardown(); | 126 | edac_workqueue_teardown(); |
| 203 | edac_sysfs_teardown_mc_kset(); | 127 | edac_sysfs_teardown_mc_kset(); |
| 204 | edac_unregister_sysfs_edac_name(); | ||
| 205 | } | 128 | } |
| 206 | 129 | ||
| 207 | /* | 130 | /* |
