From patchwork Thu Mar 9 12:11:45 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: 9613239 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 CAC5E602B4 for ; Thu, 9 Mar 2017 12:14:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B60FC285CE for ; Thu, 9 Mar 2017 12:14:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8EFB28602; Thu, 9 Mar 2017 12:14:01 +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 616DC285CE for ; Thu, 9 Mar 2017 12:14:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932208AbdCIMMp (ORCPT ); Thu, 9 Mar 2017 07:12:45 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33392 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932187AbdCIMMn (ORCPT ); Thu, 9 Mar 2017 07:12:43 -0500 Received: by mail-lf0-f67.google.com with SMTP id r36so4487648lfi.0 for ; Thu, 09 Mar 2017 04:12:37 -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=776ai/VulLi78I7xb1/uQetCwx+v2RI/eYyPkhGTGdQ=; b=C09MpoAzAbNSeMhydPBD/1Uv2u8tspXCpF1hcpiublY3ycsA9dj7jymdEgx3zcDaG6 MzQDKSxtsXDeCs9mfqkp5zHoChZDpmpPVXL1ww8PeWvOi7mjvAHgytJPQJsDM04NCFN7 WQQ352BQC4hp3FP3JlfwBo+MXuvbSBwJnPJCc= 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=776ai/VulLi78I7xb1/uQetCwx+v2RI/eYyPkhGTGdQ=; b=T5pvQ7hB6TxZ7BgEwGKlFKFiwp/fnJQMvVHJYfvDzgeZ1gGVPDYSE/MeUATdjbh1w+ kYIjtv7Vfd4Az5JJoRlUO7USnpGQ/PKyhFLWR3xQ/jrW8poFM59E/e3EsmI3ih8Ch5Po J+8wPcyZFQc046aA4mMBrGHhz7tcIPHFX704H//p/3DxA2rNFiAphxRTRNf7yyVMk8+A x9w6VJ+RhTVw2Zyn56EmMw5WnsKRJ7ChoS1teOrgP9BcXUmGU8jqF2a8ZZgosIiS7NFe XiBiGJ2Q9B/Knd4QGCo3cyakog4Wj3yoRca/hbkFAtyqijMTPfsTEckVwwjG8/TKzqLH I5MA== X-Gm-Message-State: AMke39mWE8wpcL2qAQyqNxmPuA1oe8st/P3nLhLCY2GhPH4+sLVEa8ytVvmQLGiSQAHOJQ== X-Received: by 10.25.202.29 with SMTP id a29mr3174084lfg.23.1489061556228; Thu, 09 Mar 2017 04:12:36 -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.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 04:12:35 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: "Lee, Chun-Yi" , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/14] platform/x86: msi-laptop: remove sparse_keymap_free() calls Date: Thu, 9 Mar 2017 13:11:45 +0100 Message-Id: <20170309121150.10553-10-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 msi_laptop_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/msi-laptop.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 42317704629d..9e90827c176a 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -976,23 +976,15 @@ static int __init msi_laptop_input_setup(void) err = input_register_device(msi_laptop_input_dev); if (err) - goto err_free_keymap; + goto err_free_dev; return 0; -err_free_keymap: - sparse_keymap_free(msi_laptop_input_dev); err_free_dev: input_free_device(msi_laptop_input_dev); return err; } -static void msi_laptop_input_destroy(void) -{ - sparse_keymap_free(msi_laptop_input_dev); - input_unregister_device(msi_laptop_input_dev); -} - static int __init load_scm_model_init(struct platform_device *sdev) { u8 data; @@ -1037,7 +1029,7 @@ static int __init load_scm_model_init(struct platform_device *sdev) return 0; fail_filter: - msi_laptop_input_destroy(); + input_unregister_device(msi_laptop_input_dev); fail_input: rfkill_cleanup(); @@ -1158,7 +1150,7 @@ static void __exit msi_cleanup(void) { if (quirks->load_scm_model) { i8042_remove_filter(msi_laptop_i8042_filter); - msi_laptop_input_destroy(); + input_unregister_device(msi_laptop_input_dev); cancel_delayed_work_sync(&msi_rfkill_dwork); cancel_work_sync(&msi_rfkill_work); rfkill_cleanup();