mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-06 02:24:14 +08:00
platform/x86: acer-wmi: no need to check return value of debugfs_create functions
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>
This commit is contained in:
parent
a2558e2478
commit
0b9dd93492
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user