From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932353AbdCIMMy (ORCPT ); Thu, 9 Mar 2017 07:12:54 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:36766 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932217AbdCIMMq (ORCPT ); Thu, 9 Mar 2017 07:12:46 -0500 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Herton Ronaldo Krzesinski , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/14] platform/x86: topstar-laptop: remove sparse_keymap_free() calls Date: Thu, 9 Mar 2017 13:11:48 +0100 Message-Id: <20170309121150.10553-13-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170309121150.10553-1-kernel@kempniu.pl> References: <20170309121150.10553-1-kernel@kempniu.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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ń --- drivers/platform/x86/topstar-laptop.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c index e597de05e6c2..70205d222da9 100644 --- a/drivers/platform/x86/topstar-laptop.c +++ b/drivers/platform/x86/topstar-laptop.c @@ -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); -- 2.12.0