Merge branch 'for-3.8/drivers' of git://git.kernel.dk/linux-block

[~andy/linux] / drivers / edac / edac_mc_sysfs.c

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index cf13bff94f5c795fa20fc2d874767490ffcf8c09..de2df92f9c77126709d2c8388b2d88ba7f6ed55c 100644 (file)
--- 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));
@@ -778,10 +781,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;
+                       }
                }
        }
 
@@ -839,14 +846,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,
 };
@@ -1125,10 +1126,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;
@@ -1137,11 +1143,18 @@ 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)
@@ -1149,4 +1162,5 @@ void __exit edac_mc_sysfs_exit(void)
        put_device(mci_pdev);
        device_del(mci_pdev);
        edac_put_sysfs_subsys();
+       kfree(mci_pdev);
 }