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

index 28551f5a2e0772ffc766f5df860a8cad55f75eeb..c4768be24ba9c402b8d4e0163008e11bc64d4ac1 100644 (file)
@@ -1516,14 +1516,12 @@ static int asus_input_init(struct asus_laptop *asus)
        error = input_register_device(input);
        if (error) {
                pr_warn("Unable to register input device\n");
-               goto err_free_keymap;
+               goto err_free_dev;
        }
 
        asus->inputdev = input;
        return 0;
 
-err_free_keymap:
-       sparse_keymap_free(input);
 err_free_dev:
        input_free_device(input);
        return error;
@@ -1531,10 +1529,8 @@ static int asus_input_init(struct asus_laptop *asus)
 
 static void asus_input_exit(struct asus_laptop *asus)
 {
-       if (asus->inputdev) {
-               sparse_keymap_free(asus->inputdev);
+       if (asus->inputdev)
                input_unregister_device(asus->inputdev);
-       }
        asus->inputdev = NULL;
 }