From: "Michał Kępień" <kernel@kempniu.pl>
To: Harald Welte <laforge@gnumonks.org>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 11/14] platform/x86: panasonic-laptop: remove sparse_keymap_free() calls
Date: Thu, 9 Mar 2017 13:11:47 +0100 [thread overview]
Message-ID: <20170309121150.10553-12-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().
As this reduces acpi_pcc_destroy_input() to one line, replace all calls
to that function with direct calls to input_unregister_device().
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
drivers/platform/x86/panasonic-laptop.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 59b8eb626dcc..975f4e100dbd 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -520,29 +520,17 @@ static int acpi_pcc_init_input(struct pcc_acpi *pcc)
if (error) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Unable to register input device\n"));
- goto err_free_keymap;
+ goto err_free_dev;
}
pcc->input_dev = input_dev;
return 0;
- err_free_keymap:
- sparse_keymap_free(input_dev);
err_free_dev:
input_free_device(input_dev);
return error;
}
-static void acpi_pcc_destroy_input(struct pcc_acpi *pcc)
-{
- sparse_keymap_free(pcc->input_dev);
- input_unregister_device(pcc->input_dev);
- /*
- * No need to input_free_device() since core input API refcounts
- * and free()s the device.
- */
-}
-
/* kernel module interface */
#ifdef CONFIG_PM_SLEEP
@@ -640,7 +628,7 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
out_backlight:
backlight_device_unregister(pcc->backlight);
out_input:
- acpi_pcc_destroy_input(pcc);
+ input_unregister_device(pcc->input_dev);
out_sinf:
kfree(pcc->sinf);
out_hotkey:
@@ -660,7 +648,7 @@ static int acpi_pcc_hotkey_remove(struct acpi_device *device)
backlight_device_unregister(pcc->backlight);
- acpi_pcc_destroy_input(pcc);
+ input_unregister_device(pcc->input_dev);
kfree(pcc->sinf);
kfree(pcc);
--
2.12.0
next prev parent reply other threads:[~2017-03-09 12:13 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 ` Michał Kępień [this message]
2017-03-09 12:11 ` [PATCH 12/14] platform/x86: topstar-laptop: " Michał Kępień
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-12-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=laforge@gnumonks.org \
--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®