edac: Get rid of the old kobj's from the edac mc code

Now that al users for the old kobj raw access are gone,
we can get rid of the legacy kobj-based structures and
data.

Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index b73970d14d988a059b1b97906863609bdd2387da..2c0311105a34de53a63c9d4598c6edaba2e60106 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -368,7 +368,6 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
        }
 
        mci->op_state = OP_ALLOC;
-       INIT_LIST_HEAD(&mci->grp_kobj_list);
 
        /* at this point, the root kobj is valid, and in order to
         * 'free' the object, then the function:

diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index 577b124e9dbf59def430cb18c37361be4e67ba92..5577a73c000cfab620a6f5a5df6b03b03d967539 100644 (file)
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1408,7 +1408,6 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
        if (mci == NULL)
                return -ENOMEM;
 
-       kobject_get(&mci->edac_mci_kobj);
        debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci);
 
        mci->pdev = &pdev->dev; /* record ptr  to the generic device */
@@ -1481,7 +1480,6 @@ fail1:
        i5000_put_devices(mci);
 
 fail0:
-       kobject_put(&mci->edac_mci_kobj);
        edac_mc_free(mci);
        return -ENODEV;
 }
@@ -1527,7 +1525,6 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
 
        /* retrieve references to resources, and free those resources */
        i5000_put_devices(mci);
-       kobject_put(&mci->edac_mci_kobj);
        edac_mc_free(mci);
 }
 

diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index f7ec9f1bad8fa152f52ea0aeaa1322f5d76d15d5..368f54d695d2243357ab7e31423358c09a2ffa61 100644 (file)
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -425,9 +425,6 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                goto fail0;
        }
 
-       /* Keeps mci available after edac_mc_del_mc() till edac_mc_free() */
-       kobject_get(&mci->edac_mci_kobj);
-
        debugf3("%s(): init mci\n", __func__);
        mci->pdev = &pdev->dev;
        mci->mtype_cap = MEM_FLAG_DDR;
@@ -470,7 +467,6 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
        return 0;
 
 fail1:
-       kobject_put(&mci->edac_mci_kobj);
        edac_mc_free(mci);
 
 fail0:

diff --git a/include/linux/edac.h b/include/linux/edac.h
index a36df2ad3f296de27e0ac3b23e069b1b0bea206c..19361340b1c5eb0e6a3b704b43fb160c49b73902 100644 (file)
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -452,7 +452,6 @@ struct dimm_info {
        /* Memory location data */
        unsigned location[EDAC_MAX_LAYERS];
 
-       struct kobject kobj;            /* sysfs kobject for this csrow */
        struct mem_ctl_info *mci;       /* the parent */
 
        u32 grain;              /* granularity of reported error in bytes */
@@ -506,34 +505,11 @@ struct csrow_info {
 
        struct mem_ctl_info *mci;       /* the parent */
 
-       struct kobject kobj;    /* sysfs kobject for this csrow */
-
        /* channel information for this csrow */
        u32 nr_channels;
        struct rank_info *channels;
 };
 
-struct mcidev_sysfs_group {
-       const char *name;                               /* group name */
-       const struct mcidev_sysfs_attribute *mcidev_attr; /* group attributes */
-};
-
-/* mcidev_sysfs_attribute structure
- *     used for driver sysfs attributes and in mem_ctl_info
- *     sysfs top level entries
- */
-struct mcidev_sysfs_attribute {
-       /* It should use either attr or grp */
-       struct attribute attr;
-       const struct mcidev_sysfs_group *grp;   /* Points to a group of attributes */
-
-       /* Ops for show/store values at the attribute - not used on group */
-       ssize_t (*show)(struct mem_ctl_info *, char *);
-       ssize_t (*store)(struct mem_ctl_info *, const char *, size_t);
-
-       void *priv;
-};
-
 /*
  * struct errcount_attribute - used to store the several error counts
  */
@@ -636,12 +612,6 @@ struct mem_ctl_info {
 
        struct completion complete;
 
-       /* edac sysfs device control */
-       struct kobject edac_mci_kobj;
-
-       /* list for all grp instances within a mc */
-       struct list_head grp_kobj_list;
-
        /* Additional top controller level attributes, but specified
         * by the low level driver.
         *