Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / drivers / edac / debugfs.c

diff --git a/drivers/edac/debugfs.c b/drivers/edac/debugfs.c
index 92dbb7e2320c78fe8cfc69fa80078de5b7b7f682..0a9277228c505c152cbc2f3add2b3a119ea58e6b 100644 (file)
--- a/drivers/edac/debugfs.c
+++ b/drivers/edac/debugfs.c
@@ -41,14 +41,9 @@ static const struct file_operations debug_fake_inject_fops = {
        .llseek = generic_file_llseek,
 };
 
-int __init edac_debugfs_init(void)
+void __init edac_debugfs_init(void)
 {
        edac_debugfs = debugfs_create_dir("edac", NULL);
-       if (IS_ERR(edac_debugfs)) {
-               edac_debugfs = NULL;
-               return -ENOMEM;
-       }
-       return 0;
 }
 
 void edac_debugfs_exit(void)
@@ -56,50 +51,31 @@ void edac_debugfs_exit(void)
        debugfs_remove_recursive(edac_debugfs);
 }
 
-int edac_create_debugfs_nodes(struct mem_ctl_info *mci)
+void edac_create_debugfs_nodes(struct mem_ctl_info *mci)
 {
-       struct dentry *d, *parent;
+       struct dentry *parent;
        char name[80];
        int i;
 
-       if (!edac_debugfs)
-               return -ENODEV;
-
-       d = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);
-       if (!d)
-               return -ENOMEM;
-       parent = d;
+       parent = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);
 
        for (i = 0; i < mci->n_layers; i++) {
                sprintf(name, "fake_inject_%s",
                             edac_layer_name[mci->layers[i].type]);
-               d = debugfs_create_u8(name, S_IRUGO | S_IWUSR, parent,
-                                     &mci->fake_inject_layer[i]);
-               if (!d)
-                       goto nomem;
+               debugfs_create_u8(name, S_IRUGO | S_IWUSR, parent,
+                                 &mci->fake_inject_layer[i]);
        }
 
-       d = debugfs_create_bool("fake_inject_ue", S_IRUGO | S_IWUSR, parent,
-                               &mci->fake_inject_ue);
-       if (!d)
-               goto nomem;
+       debugfs_create_bool("fake_inject_ue", S_IRUGO | S_IWUSR, parent,
+                           &mci->fake_inject_ue);
 
-       d = debugfs_create_u16("fake_inject_count", S_IRUGO | S_IWUSR, parent,
-                               &mci->fake_inject_count);
-       if (!d)
-               goto nomem;
+       debugfs_create_u16("fake_inject_count", S_IRUGO | S_IWUSR, parent,
+                          &mci->fake_inject_count);
 
-       d = debugfs_create_file("fake_inject", S_IWUSR, parent,
-                               &mci->dev,
-                               &debug_fake_inject_fops);
-       if (!d)
-               goto nomem;
+       debugfs_create_file("fake_inject", S_IWUSR, parent, &mci->dev,
+                           &debug_fake_inject_fops);
 
        mci->debugfs = parent;
-       return 0;
-nomem:
-       edac_debugfs_remove_recursive(mci->debugfs);
-       return -ENOMEM;
 }
 
 /* Create a toplevel dir under EDAC's debugfs hierarchy */