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

index 8cdf315f9730abd35fdbc9ed85b8f0237763a5c4..6f11c51b7e601dc45f340ef8ba890507c836d390 100644 (file)
@@ -1205,14 +1205,12 @@ static int eeepc_input_init(struct eeepc_laptop *eeepc)
        error = input_register_device(input);
        if (error) {
                pr_err("Unable to register input device\n");
-               goto err_free_keymap;
+               goto err_free_dev;
        }
 
        eeepc->inputdev = input;
        return 0;
 
-err_free_keymap:
-       sparse_keymap_free(input);
 err_free_dev:
        input_free_device(input);
        return error;
@@ -1220,10 +1218,8 @@ static int eeepc_input_init(struct eeepc_laptop *eeepc)
 
 static void eeepc_input_exit(struct eeepc_laptop *eeepc)
 {
-       if (eeepc->inputdev) {
-               sparse_keymap_free(eeepc->inputdev);
+       if (eeepc->inputdev)
                input_unregister_device(eeepc->inputdev);
-       }
        eeepc->inputdev = NULL;
 }