Merge tag 'platform-drivers-x86-v5.3-1' of git://git.infradead.org/linux-platform...

[linux-2.6-microblaze.git] / drivers / platform / x86 / samsung-laptop.c

diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index 123e52c..9b6a93f 100644 (file)
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -1276,15 +1276,12 @@ static void samsung_debugfs_exit(struct samsung_laptop *samsung)
        debugfs_remove_recursive(samsung->debug.root);
 }
 
-static int samsung_debugfs_init(struct samsung_laptop *samsung)
+static void samsung_debugfs_init(struct samsung_laptop *samsung)
 {
-       struct dentry *dent;
+       struct dentry *root;
 
-       samsung->debug.root = debugfs_create_dir("samsung-laptop", NULL);
-       if (!samsung->debug.root) {
-               pr_err("failed to create debugfs directory");
-               goto error_debugfs;
-       }
+       root = debugfs_create_dir("samsung-laptop", NULL);
+       samsung->debug.root = root;
 
        samsung->debug.f0000_wrapper.data = samsung->f0000_segment;
        samsung->debug.f0000_wrapper.size = 0xffff;
@@ -1295,60 +1292,24 @@ static int samsung_debugfs_init(struct samsung_laptop *samsung)
        samsung->debug.sdiag_wrapper.data = samsung->sdiag;
        samsung->debug.sdiag_wrapper.size = strlen(samsung->sdiag);
 
-       dent = debugfs_create_u16("command", S_IRUGO | S_IWUSR,
-                                 samsung->debug.root, &samsung->debug.command);
-       if (!dent)
-               goto error_debugfs;
-
-       dent = debugfs_create_u32("d0", S_IRUGO | S_IWUSR, samsung->debug.root,
-                                 &samsung->debug.data.d0);
-       if (!dent)
-               goto error_debugfs;
-
-       dent = debugfs_create_u32("d1", S_IRUGO | S_IWUSR, samsung->debug.root,
-                                 &samsung->debug.data.d1);
-       if (!dent)
-               goto error_debugfs;
-
-       dent = debugfs_create_u16("d2", S_IRUGO | S_IWUSR, samsung->debug.root,
-                                 &samsung->debug.data.d2);
-       if (!dent)
-               goto error_debugfs;
-
-       dent = debugfs_create_u8("d3", S_IRUGO | S_IWUSR, samsung->debug.root,
-                                &samsung->debug.data.d3);
-       if (!dent)
-               goto error_debugfs;
-
-       dent = debugfs_create_blob("data", S_IRUGO | S_IWUSR,
-                                  samsung->debug.root,
-                                  &samsung->debug.data_wrapper);
-       if (!dent)
-               goto error_debugfs;
-
-       dent = debugfs_create_blob("f0000_segment", S_IRUSR | S_IWUSR,
-                                  samsung->debug.root,
-                                  &samsung->debug.f0000_wrapper);
-       if (!dent)
-               goto error_debugfs;
-
-       dent = debugfs_create_file("call", S_IFREG | S_IRUGO,
-                                  samsung->debug.root, samsung,
-                                  &samsung_laptop_call_fops);
-       if (!dent)
-               goto error_debugfs;
-
-       dent = debugfs_create_blob("sdiag", S_IRUGO | S_IWUSR,
-                                  samsung->debug.root,
-                                  &samsung->debug.sdiag_wrapper);
-       if (!dent)
-               goto error_debugfs;
-
-       return 0;
-
-error_debugfs:
-       samsung_debugfs_exit(samsung);
-       return -ENOMEM;
+       debugfs_create_u16("command", S_IRUGO | S_IWUSR, root,
+                          &samsung->debug.command);
+       debugfs_create_u32("d0", S_IRUGO | S_IWUSR, root,
+                          &samsung->debug.data.d0);
+       debugfs_create_u32("d1", S_IRUGO | S_IWUSR, root,
+                          &samsung->debug.data.d1);
+       debugfs_create_u16("d2", S_IRUGO | S_IWUSR, root,
+                          &samsung->debug.data.d2);
+       debugfs_create_u8("d3", S_IRUGO | S_IWUSR, root,
+                         &samsung->debug.data.d3);
+       debugfs_create_blob("data", S_IRUGO | S_IWUSR, root,
+                           &samsung->debug.data_wrapper);
+       debugfs_create_blob("f0000_segment", S_IRUSR | S_IWUSR, root,
+                           &samsung->debug.f0000_wrapper);
+       debugfs_create_file("call", S_IFREG | S_IRUGO, root, samsung,
+                           &samsung_laptop_call_fops);
+       debugfs_create_blob("sdiag", S_IRUGO | S_IWUSR, root,
+                           &samsung->debug.sdiag_wrapper);
 }
 
 static void samsung_sabi_exit(struct samsung_laptop *samsung)
@@ -1741,9 +1702,7 @@ static int __init samsung_init(void)
        if (ret)
                goto error_lid_handling;
 
-       ret = samsung_debugfs_init(samsung);
-       if (ret)
-               goto error_debugfs;
+       samsung_debugfs_init(samsung);
 
        samsung->pm_nb.notifier_call = samsung_pm_notification;
        register_pm_notifier(&samsung->pm_nb);
@@ -1751,8 +1710,6 @@ static int __init samsung_init(void)
        samsung_platform_device = samsung->platform_device;
        return ret;
 
-error_debugfs:
-       samsung_lid_handling_exit(samsung);
 error_lid_handling:
        samsung_leds_exit(samsung);
 error_leds: