From: "Michał Kępień" <kernel@kempniu.pl>
To: Jonathan Woithe <jwoithe@just42.net>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/8] platform/x86: fujitsu-laptop: switch to a managed hotkey input device
Date: Mon, 20 Mar 2017 10:32:21 +0100 [thread overview]
Message-ID: <20170320093224.18541-6-kernel@kempniu.pl> (raw)
In-Reply-To: <20170320093224.18541-1-kernel@kempniu.pl>
Use a managed input device for hotkey events in order to simplify two
error paths and one cleanup function while also reducing the number of
local variables required. Remove double assignment to make checkpatch
happy.
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
drivers/platform/x86/fujitsu-laptop.c | 55 ++++++++++++-----------------------
1 file changed, 19 insertions(+), 36 deletions(-)
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index b1a08d83330b..74da588ed871 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -759,41 +759,29 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
static int acpi_fujitsu_laptop_input_setup(struct acpi_device *device)
{
struct fujitsu_laptop *fujitsu_laptop = acpi_driver_data(device);
- struct input_dev *input;
- int error;
- fujitsu_laptop->input = input = input_allocate_device();
- if (!input)
+ fujitsu_laptop->input = devm_input_allocate_device(&device->dev);
+ if (!fujitsu_laptop->input)
return -ENOMEM;
snprintf(fujitsu_laptop->phys, sizeof(fujitsu_laptop->phys),
"%s/video/input0", acpi_device_hid(device));
- input->name = acpi_device_name(device);
- input->phys = fujitsu_laptop->phys;
- input->id.bustype = BUS_HOST;
- input->id.product = 0x06;
- input->dev.parent = &device->dev;
-
- set_bit(EV_KEY, input->evbit);
- set_bit(fujitsu_bl->keycode1, input->keybit);
- set_bit(fujitsu_bl->keycode2, input->keybit);
- set_bit(fujitsu_bl->keycode3, input->keybit);
- set_bit(fujitsu_bl->keycode4, input->keybit);
- set_bit(fujitsu_bl->keycode5, input->keybit);
- set_bit(KEY_TOUCHPAD_TOGGLE, input->keybit);
- set_bit(KEY_UNKNOWN, input->keybit);
-
- error = input_register_device(input);
- if (error)
- goto err_free_input_dev;
-
- return 0;
-
-err_free_input_dev:
- input_free_device(input);
-
- return error;
+ fujitsu_laptop->input->name = acpi_device_name(device);
+ fujitsu_laptop->input->phys = fujitsu_laptop->phys;
+ fujitsu_laptop->input->id.bustype = BUS_HOST;
+ fujitsu_laptop->input->id.product = 0x06;
+
+ set_bit(EV_KEY, fujitsu_laptop->input->evbit);
+ set_bit(fujitsu_bl->keycode1, fujitsu_laptop->input->keybit);
+ set_bit(fujitsu_bl->keycode2, fujitsu_laptop->input->keybit);
+ set_bit(fujitsu_bl->keycode3, fujitsu_laptop->input->keybit);
+ set_bit(fujitsu_bl->keycode4, fujitsu_laptop->input->keybit);
+ set_bit(fujitsu_bl->keycode5, fujitsu_laptop->input->keybit);
+ set_bit(KEY_TOUCHPAD_TOGGLE, fujitsu_laptop->input->keybit);
+ set_bit(KEY_UNKNOWN, fujitsu_laptop->input->keybit);
+
+ return input_register_device(fujitsu_laptop->input);
}
static int fujitsu_laptop_platform_add(void)
@@ -862,7 +850,7 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
error = acpi_bus_update_power(fujitsu_laptop->acpi_handle, &state);
if (error) {
pr_err("Error reading power state\n");
- goto err_unregister_input_dev;
+ goto err_free_fifo;
}
pr_info("ACPI: %s [%s] (%s)\n",
@@ -911,7 +899,7 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
error = fujitsu_laptop_platform_add();
if (error)
- goto err_unregister_input_dev;
+ goto err_free_fifo;
#if IS_ENABLED(CONFIG_LEDS_CLASS)
if (call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) {
@@ -974,8 +962,6 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
return result;
-err_unregister_input_dev:
- input_unregister_device(fujitsu_laptop->input);
err_free_fifo:
kfifo_free(&fujitsu_laptop->fifo);
err_stop:
@@ -985,7 +971,6 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
static int acpi_fujitsu_laptop_remove(struct acpi_device *device)
{
struct fujitsu_laptop *fujitsu_laptop = acpi_driver_data(device);
- struct input_dev *input = fujitsu_laptop->input;
#if IS_ENABLED(CONFIG_LEDS_CLASS)
if (fujitsu_laptop->logolamp_registered)
@@ -1003,8 +988,6 @@ static int acpi_fujitsu_laptop_remove(struct acpi_device *device)
fujitsu_laptop_platform_remove();
- input_unregister_device(input);
-
kfifo_free(&fujitsu_laptop->fifo);
fujitsu_laptop->acpi_handle = NULL;
--
2.12.0
next prev parent reply other threads:[~2017-03-20 12:46 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-20 9:32 [PATCH 0/8] fujitsu-laptop: use sparse keymaps for input event handling Michał Kępień
2017-03-20 9:32 ` [PATCH 1/8] platform/x86: fujitsu-laptop: move backlight input device setup to a separate function Michał Kępień
2017-03-29 19:54 ` Darren Hart
2017-03-30 4:04 ` Jonathan Woithe
2017-03-20 9:32 ` [PATCH 2/8] platform/x86: fujitsu-laptop: switch to a managed backlight input device Michał Kępień
2017-03-29 19:58 ` Darren Hart
2017-03-20 9:32 ` [PATCH 3/8] platform/x86: fujitsu-laptop: use a sparse keymap for brightness key event generation Michał Kępień
2017-03-20 9:32 ` [PATCH 4/8] platform/x86: fujitsu-laptop: move hotkey input device setup to a separate function Michał Kępień
2017-03-29 20:12 ` Darren Hart
2017-03-20 9:32 ` Michał Kępień [this message]
2017-03-20 9:32 ` [PATCH 6/8] platform/x86: fujitsu-laptop: use a sparse keymap for hotkey event generation Michał Kępień
2017-03-31 11:22 ` Michał Kępień
2017-04-01 20:00 ` Darren Hart
2017-04-02 9:01 ` Jonathan Woithe
2017-03-20 9:32 ` [PATCH 7/8] platform/x86: fujitsu-laptop: model-dependent sparse keymap overrides Michał Kępień
2017-03-27 0:40 ` Jonathan Woithe
2017-03-20 9:32 ` [PATCH 8/8] platform/x86: fujitsu-laptop: remove keycode fields from struct fujitsu_bl Michał Kępień
2017-03-24 10:49 ` [PATCH 0/8] fujitsu-laptop: use sparse keymaps for input event handling Jonathan Woithe
2017-03-27 23:57 ` Jonathan Woithe
2017-03-28 6:16 ` Michał Kępień
2017-03-28 23:00 ` Jonathan Woithe
2017-03-29 7:19 ` Michał Kępień
2017-03-29 16:35 ` Andy Shevchenko
2017-03-30 3:36 ` Darren Hart
2017-03-30 3:56 ` Jonathan Woithe
2017-03-30 5:04 ` Darren Hart
2017-03-30 6:41 ` Michał Kępień
2017-03-30 22:25 ` Jonathan Woithe
2017-03-29 19:28 ` Darren Hart
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=20170320093224.18541-6-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=jwoithe@just42.net \
--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