aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/edac/edac_mc.c7
-rw-r--r--include/linux/edac.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 281f566a5513..a641f623fffd 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -441,13 +441,6 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
441 441
442 mci->op_state = OP_ALLOC; 442 mci->op_state = OP_ALLOC;
443 443
444 /* at this point, the root kobj is valid, and in order to
445 * 'free' the object, then the function:
446 * edac_mc_unregister_sysfs_main_kobj() must be called
447 * which will perform kobj unregistration and the actual free
448 * will occur during the kobject callback operation
449 */
450
451 return mci; 444 return mci;
452 445
453error: 446error:
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 1b8c02b36f76..4784213c819d 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -14,7 +14,6 @@
14 14
15#include <linux/atomic.h> 15#include <linux/atomic.h>
16#include <linux/device.h> 16#include <linux/device.h>
17#include <linux/kobject.h>
18#include <linux/completion.h> 17#include <linux/completion.h>
19#include <linux/workqueue.h> 18#include <linux/workqueue.h>
20#include <linux/debugfs.h> 19#include <linux/debugfs.h>