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

[platform/kernel/linux-rpi.git] / drivers / platform / x86 / ideapad-laptop.c

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 5fb9bfd..7598cd4 100644 (file)
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -316,34 +316,15 @@ static int debugfs_cfg_show(struct seq_file *s, void *data)
 }
 DEFINE_SHOW_ATTRIBUTE(debugfs_cfg);
 
-static int ideapad_debugfs_init(struct ideapad_private *priv)
+static void ideapad_debugfs_init(struct ideapad_private *priv)
 {
-       struct dentry *node;
+       struct dentry *dir;
 
-       priv->debug = debugfs_create_dir("ideapad", NULL);
-       if (priv->debug == NULL) {
-               pr_err("failed to create debugfs directory");
-               goto errout;
-       }
-
-       node = debugfs_create_file("cfg", S_IRUGO, priv->debug, priv,
-                                  &debugfs_cfg_fops);
-       if (!node) {
-               pr_err("failed to create cfg in debugfs");
-               goto errout;
-       }
-
-       node = debugfs_create_file("status", S_IRUGO, priv->debug, priv,
-                                  &debugfs_status_fops);
-       if (!node) {
-               pr_err("failed to create status in debugfs");
-               goto errout;
-       }
-
-       return 0;
+       dir = debugfs_create_dir("ideapad", NULL);
+       priv->debug = dir;
 
-errout:
-       return -ENOMEM;
+       debugfs_create_file("cfg", S_IRUGO, dir, priv, &debugfs_cfg_fops);
+       debugfs_create_file("status", S_IRUGO, dir, priv, &debugfs_status_fops);
 }
 
 static void ideapad_debugfs_exit(struct ideapad_private *priv)
@@ -1012,9 +993,7 @@ static int ideapad_acpi_add(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = ideapad_debugfs_init(priv);
-       if (ret)
-               goto debugfs_failed;
+       ideapad_debugfs_init(priv);
 
        ret = ideapad_input_init(priv);
        if (ret)
@@ -1071,7 +1050,6 @@ backlight_failed:
        ideapad_input_exit(priv);
 input_failed:
        ideapad_debugfs_exit(priv);
-debugfs_failed:
        ideapad_sysfs_exit(priv);
        return ret;
 }