From: "Michał Kępień" <kernel@kempniu.pl>
To: Herton Ronaldo Krzesinski <herton@canonical.com>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 12/14] platform/x86: topstar-laptop: remove sparse_keymap_free() calls
Date: Thu, 9 Mar 2017 13:11:48 +0100 [thread overview]
Message-ID: <20170309121150.10553-13-kernel@kempniu.pl> (raw)
In-Reply-To: <20170309121150.10553-1-kernel@kempniu.pl>
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ń <kernel@kempniu.pl>
---
drivers/platform/x86/topstar-laptop.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c
index e597de05e6c2..70205d222da9 100644
--- a/drivers/platform/x86/topstar-laptop.c
+++ b/drivers/platform/x86/topstar-laptop.c
@@ -113,14 +113,12 @@ static int acpi_topstar_init_hkey(struct topstar_hkey *hkey)
error = input_register_device(input);
if (error) {
pr_err("Unable to register input device\n");
- goto err_free_keymap;
+ goto err_free_dev;
}
hkey->inputdev = input;
return 0;
- err_free_keymap:
- sparse_keymap_free(input);
err_free_dev:
input_free_device(input);
return error;
@@ -157,7 +155,6 @@ static int acpi_topstar_remove(struct acpi_device *device)
acpi_topstar_fncx_switch(device, false);
- sparse_keymap_free(tps_hkey->inputdev);
input_unregister_device(tps_hkey->inputdev);
kfree(tps_hkey);
--
2.12.0
next prev parent reply other threads:[~2017-03-09 12:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-09 12:11 [PATCH 00/14] platform/x86: " Michał Kępień
2017-03-09 12:11 ` [PATCH 01/14] platform/x86: acer-wmi: " Michał Kępień
2017-03-09 12:11 ` [PATCH 02/14] platform/x86: asus-laptop: " Michał Kępień
2017-03-09 12:11 ` [PATCH 03/14] platform/x86: asus-wmi: " Michał Kępień
2017-03-09 12:11 ` [PATCH 04/14] platform/x86: dell-wmi-aio: " Michał Kępień
2017-03-09 12:11 ` [PATCH 05/14] platform/x86: dell-wmi: " Michał Kępień
2017-03-09 12:11 ` [PATCH 06/14] platform/x86: eeepc-laptop: " Michał Kępień
2017-03-09 12:11 ` [PATCH 07/14] platform/x86: hp-wmi: " Michał Kępień
2017-03-09 12:11 ` [PATCH 08/14] platform/x86: ideapad-laptop: " Michał Kępień
2017-03-09 12:11 ` [PATCH 09/14] platform/x86: msi-laptop: " Michał Kępień
2017-03-09 12:11 ` [PATCH 10/14] platform/x86: msi-wmi: " Michał Kępień
2017-03-09 12:11 ` [PATCH 11/14] platform/x86: panasonic-laptop: " Michał Kępień
2017-03-09 12:11 ` Michał Kępień [this message]
2017-03-09 12:11 ` [PATCH 13/14] platform/x86: toshiba-wmi: " Michał Kępień
2017-03-09 12:11 ` [PATCH 14/14] platform/x86: toshiba_acpi: " Michał Kępień
2017-03-13 16:11 ` [PATCH 00/14] platform/x86: " Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170309121150.10553-13-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=herton@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®