]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
platform/x86: asus-wmi: remove sparse_keymap_free() calls
authorMichał Kępień <kernel@kempniu.pl>
Thu, 9 Mar 2017 12:11:39 +0000 (13:11 +0100)
committerDarren Hart <dvhart@infradead.org>
Wed, 15 Mar 2017 05:58:03 +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/asus-wmi.c

index 8fe5890bf539f4f2eb722139f4c56a3065403e92..d817e6327fecdc725e0d5ce081740c5dcf3e8483 100644 (file)
@@ -269,12 +269,10 @@ static int asus_wmi_input_init(struct asus_wmi *asus)
 
        err = input_register_device(asus->inputdev);
        if (err)
-               goto err_free_keymap;
+               goto err_free_dev;
 
        return 0;
 
-err_free_keymap:
-       sparse_keymap_free(asus->inputdev);
 err_free_dev:
        input_free_device(asus->inputdev);
        return err;
@@ -282,10 +280,8 @@ static int asus_wmi_input_init(struct asus_wmi *asus)
 
 static void asus_wmi_input_exit(struct asus_wmi *asus)
 {
-       if (asus->inputdev) {
-               sparse_keymap_free(asus->inputdev);
+       if (asus->inputdev)
                input_unregister_device(asus->inputdev);
-       }
 
        asus->inputdev = NULL;
 }