From patchwork Thu Mar 9 12:11:49 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: 9613233 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 0067C604DD for ; Thu, 9 Mar 2017 12:13:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E155B285CE for ; Thu, 9 Mar 2017 12:13:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D29B9285FF; Thu, 9 Mar 2017 12:13:36 +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 7B75B285FF for ; Thu, 9 Mar 2017 12:13:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932123AbdCIMNV (ORCPT ); Thu, 9 Mar 2017 07:13:21 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33429 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932268AbdCIMMt (ORCPT ); Thu, 9 Mar 2017 07:12:49 -0500 Received: by mail-lf0-f67.google.com with SMTP id r36so4487949lfi.0 for ; Thu, 09 Mar 2017 04:12:47 -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=WU8mVQSRX1nO+S162HcaUnNN6IAqKCZ8AFqzitJjbT0=; b=Qak/KjQuPcPmyAbNS3mV+zB6qaVaiwXVb2CUxzZSSHjJEsSNUva5WGDDJRkgPWKQv4 vpGMh2/pBvBW5AcGs4RLguF+9GsdoKpwvoBJOeTxywBPkFjFpa6UWuD94BozCEyg6bb0 6SZjo345bIrUylLLH+zoI0Nib+fvuP8KnrNj4= 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=WU8mVQSRX1nO+S162HcaUnNN6IAqKCZ8AFqzitJjbT0=; b=LHl/s9tbJnQvHbEbGHJiIYXaRBFiQ6yTFJRDVuHlVCtiPK1Ckm/tycjfvK0rMg+TVY pYaj7Em7Liug2vT0CPdQvZuadCYjTVz2nlNBWu909OqXEqb+aeC8Oyprr3vFqCUWfqhj R57Mw9gcokhPNQiPhaw5xXzc/bwWty5AgKK4DJhsZCaVfmyvNzeOHANCEnFPJmn6aFIk RVXYFgOr2woPD6Aej123gY5mpJkhLOlJ5/a2f7zmQXhs4mC3N+fCeglzbND4cizoXNwB ZfeOWLkb+kp3JcPLL4j53z506gBW+Jzb8oydn2mHuQtkqs6nHhvD8sXOmfmdZqCUE9QC spdQ== X-Gm-Message-State: AMke39nrJ7zcPRvQel9dd/TvR4lCxlMSJLACyBxFLJTo0II2iOb0vPrJcx9n/jQXWmM9oA== X-Received: by 10.25.196.207 with SMTP id u198mr3388936lff.88.1489061566895; Thu, 09 Mar 2017 04:12:46 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 04:12:46 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Azael Avalos , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/14] platform/x86: toshiba-wmi: remove sparse_keymap_free() calls Date: Thu, 9 Mar 2017 13:11:49 +0100 Message-Id: <20170309121150.10553-14-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/toshiba-wmi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/platform/x86/toshiba-wmi.c b/drivers/platform/x86/toshiba-wmi.c index 2df07ee8f3c3..440528676170 100644 --- a/drivers/platform/x86/toshiba-wmi.c +++ b/drivers/platform/x86/toshiba-wmi.c @@ -96,7 +96,7 @@ static int __init toshiba_wmi_input_setup(void) toshiba_wmi_notify, NULL); if (ACPI_FAILURE(status)) { err = -EIO; - goto err_free_keymap; + goto err_free_dev; } err = input_register_device(toshiba_wmi_input_dev); @@ -107,8 +107,6 @@ static int __init toshiba_wmi_input_setup(void) err_remove_notifier: wmi_remove_notify_handler(WMI_EVENT_GUID); - err_free_keymap: - sparse_keymap_free(toshiba_wmi_input_dev); err_free_dev: input_free_device(toshiba_wmi_input_dev); return err; @@ -117,7 +115,6 @@ static int __init toshiba_wmi_input_setup(void) static void toshiba_wmi_input_destroy(void) { wmi_remove_notify_handler(WMI_EVENT_GUID); - sparse_keymap_free(toshiba_wmi_input_dev); input_unregister_device(toshiba_wmi_input_dev); }