1 files changed, 32 insertions, 24 deletions

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index ed0bc07b8503..0ca1ca71157f 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -180,6 +180,9 @@ static ssize_t csrow_size_show(struct device *dev,
         int i;
         u32 nr_pages = 0;
 
+        if (csrow->mci->csbased)
+                return sprintf(data, "%u\n", PAGES_TO_MiB(csrow->nr_pages));
+
         for (i = 0; i < csrow->nr_channels; i++)
                 nr_pages += csrow->channels[i]->dimm->nr_pages;
         return sprintf(data, "%u\n", PAGES_TO_MiB(nr_pages));
@@ -373,6 +376,7 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci,
         csrow->dev.bus = &mci->bus;
         device_initialize(&csrow->dev);
         csrow->dev.parent = &mci->dev;
+        csrow->mci = mci;
         dev_set_name(&csrow->dev, "csrow%d", index);
         dev_set_drvdata(&csrow->dev, csrow);
 
@@ -468,8 +472,7 @@ static void edac_delete_csrow_objects(struct mem_ctl_info *mci)
                         device_remove_file(&csrow->dev,
                                                 dynamic_csrow_ce_count_attr[chan]);
                 }
-                put_device(&mci->csrows[i]->dev);
-                device_del(&mci->csrows[i]->dev);
+                device_unregister(&mci->csrows[i]->dev);
         }
 }
 #endif
@@ -777,10 +780,14 @@ static ssize_t mci_size_mb_show(struct device *dev,
         for (csrow_idx = 0; csrow_idx < mci->nr_csrows; csrow_idx++) {
                 struct csrow_info *csrow = mci->csrows[csrow_idx];
 
-                for (j = 0; j < csrow->nr_channels; j++) {
-                        struct dimm_info *dimm = csrow->channels[j]->dimm;
+                if (csrow->mci->csbased) {
+                        total_pages += csrow->nr_pages;
+                } else {
+                        for (j = 0; j < csrow->nr_channels; j++) {
+                                struct dimm_info *dimm = csrow->channels[j]->dimm;
 
-                        total_pages += dimm->nr_pages;
+                                total_pages += dimm->nr_pages;
+                        }
                 }
         }
 
@@ -838,14 +845,8 @@ static ssize_t edac_fake_inject_write(struct file *file,
         return count;
 }
 
-static int debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static const struct file_operations debug_fake_inject_fops = {
-        .open = debugfs_open,
+        .open = simple_open,
         .write = edac_fake_inject_write,
         .llseek = generic_file_llseek,
 };
@@ -1053,11 +1054,9 @@ fail:
                 struct dimm_info *dimm = mci->dimms[i];
                 if (dimm->nr_pages == 0)
                         continue;
-                put_device(&dimm->dev);
-                device_del(&dimm->dev);
+                device_unregister(&dimm->dev);
         }
-        put_device(&mci->dev);
-        device_del(&mci->dev);
+        device_unregister(&mci->dev);
         bus_unregister(&mci->bus);
         kfree(mci->bus.name);
         return err;
@@ -1084,16 +1083,14 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
                 if (dimm->nr_pages == 0)
                         continue;
                 edac_dbg(0, "removing device %s\n", dev_name(&dimm->dev));
-                put_device(&dimm->dev);
-                device_del(&dimm->dev);
+                device_unregister(&dimm->dev);
         }
 }
 
 void edac_unregister_sysfs(struct mem_ctl_info *mci)
 {
         edac_dbg(1, "Unregistering device %s\n", dev_name(&mci->dev));
-        put_device(&mci->dev);
-        device_del(&mci->dev);
+        device_unregister(&mci->dev);
         bus_unregister(&mci->bus);
         kfree(mci->bus.name);
 }
@@ -1124,10 +1121,15 @@ int __init edac_mc_sysfs_init(void)
         edac_subsys = edac_get_sysfs_subsys();
         if (edac_subsys == NULL) {
                 edac_dbg(1, "no edac_subsys\n");
-                return -EINVAL;
+                err = -EINVAL;
+                goto out;
         }
 
         mci_pdev = kzalloc(sizeof(*mci_pdev), GFP_KERNEL);
+        if (!mci_pdev) {
+                err = -ENOMEM;
+                goto out_put_sysfs;
+        }
 
         mci_pdev->bus = edac_subsys;
         mci_pdev->type = &mc_attr_type;
@@ -1136,16 +1138,22 @@ int __init edac_mc_sysfs_init(void)
 
         err = device_add(mci_pdev);
         if (err < 0)
-                return err;
+                goto out_dev_free;
 
         edac_dbg(0, "device %s created\n", dev_name(mci_pdev));
 
         return 0;
+
+ out_dev_free:
+        kfree(mci_pdev);
+ out_put_sysfs:
+        edac_put_sysfs_subsys();
+ out:
+        return err;
 }
 
 void __exit edac_mc_sysfs_exit(void)
 {
-        put_device(mci_pdev);
-        device_del(mci_pdev);
+        device_unregister(mci_pdev);
         edac_put_sysfs_subsys();
 }