From patchwork Thu Mar 9 12:11:50 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: 9613269 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 5CD5E60414 for ; Thu, 9 Mar 2017 12:42:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DA902836D for ; Thu, 9 Mar 2017 12:42:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 526C6284C2; Thu, 9 Mar 2017 12:42:14 +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 E700C2836D for ; Thu, 9 Mar 2017 12:42:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163AbdCIMmO (ORCPT ); Thu, 9 Mar 2017 07:42:14 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33790 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753053AbdCIMmN (ORCPT ); Thu, 9 Mar 2017 07:42:13 -0500 Received: by mail-lf0-f65.google.com with SMTP id r36so4545852lfi.0 for ; Thu, 09 Mar 2017 04:41: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=hV/MInmalenbMTpN/Yl4xMRW64S9276jSG5JFpTtFzU=; b=ISJ5jxvNt+ZFZbZTDTZjf75+GuLZxF07uRsVGW20bG+AVCnFiaR++kFyDWP15X5p7B YW5CPtq27Mo4ooF25UfKcGkBzHNv5s1wyk96QmVJ8UNhDvTZUuwaZUYKfiBCTJpeUc0y kWniJefEUal7KFhHU/mQcpCSAf457o6BhcLEw= 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=hV/MInmalenbMTpN/Yl4xMRW64S9276jSG5JFpTtFzU=; b=a280KSbW1AjU8xJo8pPVjUmauolqW5lYdH4b2GoqPYtTgVc644upObtxgPL3nsCd3g YQ0hwB+ZAs6hvFn/WIq+kFS4C5gjy5k878CdAuCd6GrA1owmccC1y/xyXpLOHF9Jc80W U5V2nPPjY9TGWfdmFQ7/kXvg9IaQQNStxQmlAYixkGhiSew7bc6wANHjfh7slL2HZfxx 3GcB/i50v8ziYp4j0paMhdFrfPgJZ4Hn+PhwS8WjC4lRA0tDRekYu6t1Ga7+b30Y6FIX faRH/7sxxdF04338j+G20gBVOzqfNPZlCSJLH8MAZSFX1jyt2DSRIfmMamVrph6dbPxf DcdQ== X-Gm-Message-State: AMke39kGcEX0xAc68K3JMg3TjUgcYbsIkW3cbvWxg0WhSd85bb860QEdRe5U3HLiEAkCPA== X-Received: by 10.25.235.77 with SMTP id j74mr3174943lfh.60.1489061568900; Thu, 09 Mar 2017 04:12:48 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 04:12:48 -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 14/14] platform/x86: toshiba_acpi: remove sparse_keymap_free() calls Date: Thu, 9 Mar 2017 13:11:50 +0100 Message-Id: <20170309121150.10553-15-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_acpi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 074bf2fa1c55..d0daf75cbed1 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -2849,7 +2849,7 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) error = i8042_install_filter(toshiba_acpi_i8042_filter); if (error) { pr_err("Error installing key filter\n"); - goto err_free_keymap; + goto err_free_dev; } dev->ntfy_supported = 1; @@ -2880,8 +2880,6 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) err_remove_filter: if (dev->ntfy_supported) i8042_remove_filter(toshiba_acpi_i8042_filter); - err_free_keymap: - sparse_keymap_free(dev->hotkey_dev); err_free_dev: input_free_device(dev->hotkey_dev); dev->hotkey_dev = NULL; @@ -3018,10 +3016,8 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev) cancel_work_sync(&dev->hotkey_work); } - if (dev->hotkey_dev) { + if (dev->hotkey_dev) input_unregister_device(dev->hotkey_dev); - sparse_keymap_free(dev->hotkey_dev); - } backlight_device_unregister(dev->backlight_dev);