OSDN Git Service

platform/x86: toshiba-wmi: remove sparse_keymap_free() calls
authorMichał Kępień <kernel@kempniu.pl>
Thu, 9 Mar 2017 12:11:49 +0000 (13:11 +0100)
committerDarren Hart <dvhart@infradead.org>
Wed, 15 Mar 2017 05:58:11 +0000 (22:58 -0700)
As sparse_keymap_setup() now uses a managed memory allocation for the
keymap copy it creates, the latter is freed automatically.  Remove all
calls to sparse_keymap_free().

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/platform/x86/toshiba-wmi.c

index 2df07ee..4405286 100644 (file)
@@ -96,7 +96,7 @@ static int __init toshiba_wmi_input_setup(void)
                                            toshiba_wmi_notify, NULL);
        if (ACPI_FAILURE(status)) {
                err = -EIO;
-               goto err_free_keymap;
+               goto err_free_dev;
        }
 
        err = input_register_device(toshiba_wmi_input_dev);
@@ -107,8 +107,6 @@ static int __init toshiba_wmi_input_setup(void)
 
  err_remove_notifier:
        wmi_remove_notify_handler(WMI_EVENT_GUID);
- err_free_keymap:
-       sparse_keymap_free(toshiba_wmi_input_dev);
  err_free_dev:
        input_free_device(toshiba_wmi_input_dev);
        return err;
@@ -117,7 +115,6 @@ static int __init toshiba_wmi_input_setup(void)
 static void toshiba_wmi_input_destroy(void)
 {
        wmi_remove_notify_handler(WMI_EVENT_GUID);
-       sparse_keymap_free(toshiba_wmi_input_dev);
        input_unregister_device(toshiba_wmi_input_dev);
 }