From patchwork Thu Mar 9 12:11:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9613225 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 66004602B4 for ; Thu, 9 Mar 2017 12:12:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51FC8285CE for ; Thu, 9 Mar 2017 12:12:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46DEE28600; Thu, 9 Mar 2017 12:12:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B93C4285CE for ; Thu, 9 Mar 2017 12:12:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932207AbdCIMMn (ORCPT ); Thu, 9 Mar 2017 07:12:43 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35832 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932095AbdCIMMl (ORCPT ); Thu, 9 Mar 2017 07:12:41 -0500 Received: by mail-lf0-f67.google.com with SMTP id v2so4478341lfi.2 for ; Thu, 09 Mar 2017 04:12:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j8jzcs2g4LQGuWvqT63V3ab7QTaa/eHOc/vaXScHeV0=; b=FoEgq7bNfSZTv6yzHLQd8lYw3XK9H+ZkgYtbwuRcZNZY1I1BbVLnyAqvyjo0tbioFI Xlvhs5i4l//VaUGL+krcyWs5EOUKLxv1oqlAZTEXcdJV4mc24ygc5aLNZaj6ZOuNE6Z7 z0kcnFoj5xjAlaohPad/hWbWRE/+WhdxK2SmY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j8jzcs2g4LQGuWvqT63V3ab7QTaa/eHOc/vaXScHeV0=; b=J2Dvh9x08bb+ybzxuN79a+/G2zrzvL21ppL1GxubX2H28NTQF3slL/MRwBzqL/OTbf UGZycJRx4c52oXO7nFvohchtrizwKMUnDW2I6UlIWTKmnybYWkkPyvfMU0vFhdLgJiQB 3aJTiw7vSZEyd5zvYppjpV0lDpiZkt2sQvp0Z7B38uXVSF4+dT7afEgcdKMIRxIGKtzf vqr4NnukDP/Sj28haiYvUfc238tNk46os29sL33fR1K45ZtMSm0J2XsbafNf1gixaTm7 f7ouKnUJEecdwUSU5EO4U3HsZ0GdjTSwz3jSn8ELmD5z3J5coYvGOfll+3S0f5Jahflh 6NyA== X-Gm-Message-State: AMke39kYbICyFtTzYMeKxd8qNb+LdJRYk6wb2U5xEjrcuiAqqBmXL6iOkILQErBpEOjH6w== X-Received: by 10.25.199.135 with SMTP id x129mr3325671lff.42.1489061559084; Thu, 09 Mar 2017 04:12:39 -0800 (PST) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id o91sm1247952lfg.1.2017.03.09.04.12.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 04:12:38 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/14] platform/x86: msi-wmi: remove sparse_keymap_free() calls Date: Thu, 9 Mar 2017 13:11:46 +0100 Message-Id: <20170309121150.10553-11-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 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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/msi-wmi.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c index 9a32f8627ecc..f6209b739ec0 100644 --- a/drivers/platform/x86/msi-wmi.c +++ b/drivers/platform/x86/msi-wmi.c @@ -281,14 +281,12 @@ static int __init msi_wmi_input_setup(void) err = input_register_device(msi_wmi_input_dev); if (err) - goto err_free_keymap; + goto err_free_dev; last_pressed = 0; return 0; -err_free_keymap: - sparse_keymap_free(msi_wmi_input_dev); err_free_dev: input_free_device(msi_wmi_input_dev); return err; @@ -342,10 +340,8 @@ static int __init msi_wmi_init(void) if (event_wmi) wmi_remove_notify_handler(event_wmi->guid); err_free_input: - if (event_wmi) { - sparse_keymap_free(msi_wmi_input_dev); + if (event_wmi) input_unregister_device(msi_wmi_input_dev); - } return err; } @@ -353,7 +349,6 @@ static void __exit msi_wmi_exit(void) { if (event_wmi) { wmi_remove_notify_handler(event_wmi->guid); - sparse_keymap_free(msi_wmi_input_dev); input_unregister_device(msi_wmi_input_dev); } backlight_device_unregister(backlight);