From patchwork Thu Mar 9 12:11:44 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: 9613241 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 E065E602B4 for ; Thu, 9 Mar 2017 12:14:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE33D285CE for ; Thu, 9 Mar 2017 12:14:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2CB228601; Thu, 9 Mar 2017 12:14:24 +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 97F4F285CE for ; Thu, 9 Mar 2017 12:14:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752157AbdCIMOW (ORCPT ); Thu, 9 Mar 2017 07:14:22 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35818 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754640AbdCIMMg (ORCPT ); Thu, 9 Mar 2017 07:12:36 -0500 Received: by mail-lf0-f65.google.com with SMTP id v2so4478179lfi.2 for ; Thu, 09 Mar 2017 04:12:35 -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=hHAiOjf2l+bIe1MIhQSV3K6TTJuYafRjy4G04ryKjf8=; b=cmRkaecy4TCvBRx1zyz0zG5rquk7FqG/paiJd3/TWdnbrax7OnKXixScWiit5ttDOH g0MrxmUDOR2oTjSet4chbM/tMAxzAFcy5bDrZbnpwyzJJ46ZZF2ryHCptTh/H2h2T8A5 g3piZoKsVJwliU+on4gwaV4r6Nh1b18PZ/rsY= 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=hHAiOjf2l+bIe1MIhQSV3K6TTJuYafRjy4G04ryKjf8=; b=Lxbex8JrZddOX+0KTYj8evngQJLml4JSJXKrbAIKZzdl2rsJx3j2ywyTyxBgFBobCj JnWeSWHn3PeAuqzvh7t4FBVKt1Kivpnudu4sZzxHEo2dURZBz3fiZLxA4+sOXz/oEhwB HXKfLHllRM2ijlZYn0NiCSKuQ/cfhEtz3Ym7uILbBS20HsRwfxcf8EZjauQBzYaDUQE9 lOGgqIXvaN2Y8caQCBYP3lkqKSU7N46+prfdXdG3CZP++RxKmedqjFtMFZExTcc5jrAy HJ3L344WqUkL68oKycO2Hkr9qm4PpwKdO9FWntwuBhF8fF6gvIHl2EPCH+HDLi1z5NjA wf0A== X-Gm-Message-State: AMke39kWuB8ndjotYAzS1sXBsjBHhKOaroeu+JYzuQS+rVd7rjSQ1wlMda1S/sh1KjDRyg== X-Received: by 10.25.196.21 with SMTP id u21mr3166254lff.81.1489061554205; Thu, 09 Mar 2017 04:12:34 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 04:12:33 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Ike Panhc , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/14] platform/x86: ideapad-laptop: remove sparse_keymap_free() calls Date: Thu, 9 Mar 2017 13:11:44 +0100 Message-Id: <20170309121150.10553-9-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/ideapad-laptop.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index f46ece2ce3c4..f64faa00c83a 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -604,14 +604,12 @@ static int ideapad_input_init(struct ideapad_private *priv) error = input_register_device(inputdev); if (error) { pr_err("Unable to register input device\n"); - goto err_free_keymap; + goto err_free_dev; } priv->inputdev = inputdev; return 0; -err_free_keymap: - sparse_keymap_free(inputdev); err_free_dev: input_free_device(inputdev); return error; @@ -619,7 +617,6 @@ static int ideapad_input_init(struct ideapad_private *priv) static void ideapad_input_exit(struct ideapad_private *priv) { - sparse_keymap_free(priv->inputdev); input_unregister_device(priv->inputdev); priv->inputdev = NULL; }