From patchwork Thu Mar 9 12:11:41 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: 9613243 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 E9F06602B4 for ; Thu, 9 Mar 2017 12:14:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8050285CE for ; Thu, 9 Mar 2017 12:14:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCEE528601; Thu, 9 Mar 2017 12:14:27 +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=unavailable 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 771C2285CE for ; Thu, 9 Mar 2017 12:14:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754769AbdCIMM3 (ORCPT ); Thu, 9 Mar 2017 07:12:29 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:35773 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754732AbdCIMM0 (ORCPT ); Thu, 9 Mar 2017 07:12:26 -0500 Received: by mail-lf0-f66.google.com with SMTP id v2so4477815lfi.2 for ; Thu, 09 Mar 2017 04:12:25 -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=+yj53q5L9H29SlRFGB6QaVqDGqfjgBhlt6sVpWpzGJw=; b=U1mFm9eahQ0f1S0zQGCL2mtoXEWOs+D4ovCTFoVvuJ+u0WrAGkhD6Xxnt96ehOQtYm XobryTDDxzqH+ALlPfOfvxbICfY52os+CcQ9vNPvika1AkbLaIPle4QeOAN7U9T4xQpY ZCfRfEcI3+xFCcKK2FaUzUPiTiwbbGC1kARh8= 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=+yj53q5L9H29SlRFGB6QaVqDGqfjgBhlt6sVpWpzGJw=; b=qqXIVCVtOM95e1ug5WukplxAUYMubz+cBZvl0fyAwhL5qMH+IzUBhv6OjHulehSLNG hRAbkSMP3fnVYzpmBwNP2EgOnbAUO1fPY/1VNqV3tcfacUADLfKTDw9ZIga6xnmfQbaD NK7WLMl4RElmt0Znyctnd6P0HGvdfscM1t0IQuLSGT7UoXtUvvWCD2Ghilb8EhWo+YNW je5cBaSnvHyShZecZhBEaqS4VJeRoBzBNKqUvEMBu0HTq1KltlINk7srcjgeLQvqfOsH FsdmF2uwelMyoDhPTvG6ERFK1Ln+c29mMrU0iAEQ3b51DeAtPgUB7/xJWzPLhvorLBx6 nVlA== X-Gm-Message-State: AMke39mptFKtIPMn7NAMCwlCKXdP/G2UEmYCY5Sg+1j2CU/voIY1ev2AeiBFlpC6TIyvHQ== X-Received: by 10.25.235.214 with SMTP id f83mr3206129lfk.27.1489061544713; Thu, 09 Mar 2017 04:12:24 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 04:12:24 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Matthew Garrett , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/14] platform/x86: dell-wmi: remove sparse_keymap_free() calls Date: Thu, 9 Mar 2017 13:11:41 +0100 Message-Id: <20170309121150.10553-6-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(). As this reduces dell_wmi_input_destroy() to one line, replace all calls to that function with direct calls to input_unregister_device(). Signed-off-by: Michał Kępień --- drivers/platform/x86/dell-wmi.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 75e637047d36..d921b26267e9 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -603,23 +603,15 @@ static int __init dell_wmi_input_setup(void) err = input_register_device(dell_wmi_input_dev); if (err) - goto err_free_keymap; + goto err_free_dev; return 0; - err_free_keymap: - sparse_keymap_free(dell_wmi_input_dev); err_free_dev: input_free_device(dell_wmi_input_dev); return err; } -static void dell_wmi_input_destroy(void) -{ - sparse_keymap_free(dell_wmi_input_dev); - input_unregister_device(dell_wmi_input_dev); -} - /* * Descriptor buffer is 128 byte long and contains: * @@ -740,7 +732,7 @@ static int __init dell_wmi_init(void) status = wmi_install_notify_handler(DELL_EVENT_GUID, dell_wmi_notify, NULL); if (ACPI_FAILURE(status)) { - dell_wmi_input_destroy(); + input_unregister_device(dell_wmi_input_dev); pr_err("Unable to register notify handler - %d\n", status); return -ENODEV; } @@ -752,7 +744,7 @@ static int __init dell_wmi_init(void) if (err) { pr_err("Failed to enable WMI events\n"); wmi_remove_notify_handler(DELL_EVENT_GUID); - dell_wmi_input_destroy(); + input_unregister_device(dell_wmi_input_dev); return err; } } @@ -766,6 +758,6 @@ static void __exit dell_wmi_exit(void) if (wmi_requires_smbios_request) dell_wmi_events_set_enabled(false); wmi_remove_notify_handler(DELL_EVENT_GUID); - dell_wmi_input_destroy(); + input_unregister_device(dell_wmi_input_dev); } module_exit(dell_wmi_exit);