platform/x86: acer-wmi: no need to check return value of debugfs_create functions
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Jun 2019 12:12:51 +0000 (14:12 +0200)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 17 Jun 2019 12:20:58 +0000 (15:20 +0300)
When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Also, because there is no need to save the file dentry, remove the
variable that was saving it and just recursively delete the whole
directory.

Cc: "Lee, Chun-Yi" <jlee@suse.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Andy Shevchenko <andy@infradead.org>
Cc: platform-driver-x86@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/platform/x86/acer-wmi.c

index fcfeadd1301f427a1f0ba3381ac7ed3fe311966a..5d0cfe837f2183b686c73c6f98f159a84fd14772 100644 (file)
@@ -272,7 +272,6 @@ struct acer_data {
 
 struct acer_debug {
        struct dentry *root;
-       struct dentry *devices;
        u32 wmid_devices;
 };
 
@@ -2161,29 +2160,15 @@ static struct platform_device *acer_platform_device;
 
 static void remove_debugfs(void)
 {
-       debugfs_remove(interface->debug.devices);
-       debugfs_remove(interface->debug.root);
+       debugfs_remove_recursive(interface->debug.root);
 }
 
-static int __init create_debugfs(void)
+static void __init create_debugfs(void)
 {
        interface->debug.root = debugfs_create_dir("acer-wmi", NULL);
-       if (!interface->debug.root) {
-               pr_err("Failed to create debugfs directory");
-               return -ENOMEM;
-       }
 
-       interface->debug.devices = debugfs_create_u32("devices", S_IRUGO,
-                                       interface->debug.root,
-                                       &interface->debug.wmid_devices);
-       if (!interface->debug.devices)
-               goto error_debugfs;
-
-       return 0;
-
-error_debugfs:
-       remove_debugfs();
-       return -ENOMEM;
+       debugfs_create_u32("devices", S_IRUGO, interface->debug.root,
+                          &interface->debug.wmid_devices);
 }
 
 static int __init acer_wmi_init(void)
@@ -2313,9 +2298,7 @@ static int __init acer_wmi_init(void)
 
        if (wmi_has_guid(WMID_GUID2)) {
                interface->debug.wmid_devices = get_wmid_devices();
-               err = create_debugfs();
-               if (err)
-                       goto error_create_debugfs;
+               create_debugfs();
        }
 
        /* Override any initial settings with values from the commandline */
@@ -2323,8 +2306,6 @@ static int __init acer_wmi_init(void)
 
        return 0;
 
-error_create_debugfs:
-       platform_device_del(acer_platform_device);
 error_device_add:
        platform_device_put(acer_platform_device);
 error_device_alloc: