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

index e597de05e6c27badfe97ea533ddb2f7a6c41d3b5..70205d222da93982e29e37d3cc7e684b4c2509ed 100644 (file)
@@ -113,14 +113,12 @@ static int acpi_topstar_init_hkey(struct topstar_hkey *hkey)
        error = input_register_device(input);
        if (error) {
                pr_err("Unable to register input device\n");
-               goto err_free_keymap;
+               goto err_free_dev;
        }
 
        hkey->inputdev = input;
        return 0;
 
- err_free_keymap:
-       sparse_keymap_free(input);
  err_free_dev:
        input_free_device(input);
        return error;
@@ -157,7 +155,6 @@ static int acpi_topstar_remove(struct acpi_device *device)
 
        acpi_topstar_fncx_switch(device, false);
 
-       sparse_keymap_free(tps_hkey->inputdev);
        input_unregister_device(tps_hkey->inputdev);
        kfree(tps_hkey);