On Wed, Jun 12, 2019 at 3:13 PM Greg Kroah-Hartman
<gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> 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.
>
Through which tree you want to proceed this?
> Cc: "Lee, Chun-Yi" <jlee@xxxxxxxx>
> Cc: Darren Hart <dvhart@xxxxxxxxxxxxx>
> Cc: Andy Shevchenko <andy@xxxxxxxxxxxxx>
> Cc: platform-driver-x86@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/platform/x86/acer-wmi.c | 29 +++++------------------------
> 1 file changed, 5 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
> index 521b526cd467..f8f0e98b1f0b 100644
> --- a/drivers/platform/x86/acer-wmi.c
> +++ b/drivers/platform/x86/acer-wmi.c
> @@ -259,7 +259,6 @@ struct acer_data {
>
> struct acer_debug {
> struct dentry *root;
> - struct dentry *devices;
> u32 wmid_devices;
> };
>
> @@ -2148,29 +2147,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)
> @@ -2300,9 +2285,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 */
> @@ -2310,8 +2293,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:
> --
> 2.22.0
>
--
With Best Regards,
Andy Shevchenko
