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 1/8] platform/x86: fujitsu-laptop: move backlight input device setup to a separate function
Date: Mon, 20 Mar 2017 10:32:17 +0100 [thread overview]
Message-ID: <20170320093224.18541-2-kernel@kempniu.pl> (raw)
In-Reply-To: <20170320093224.18541-1-kernel@kempniu.pl>
Simplify error handling in acpi_fujitsu_bl_add() by moving code
responsible for setting up the input device to a separate function.
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
drivers/platform/x86/fujitsu-laptop.c | 64 +++++++++++++++++++++--------------
1 file changed, 38 insertions(+), 26 deletions(-)
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index f3ccef3d5a1e..2b0dcf989e2a 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -590,6 +590,41 @@ static const struct dmi_system_id fujitsu_dmi_table[] __initconst = {
/* ACPI device for LCD brightness control */
+static int acpi_fujitsu_bl_input_setup(struct acpi_device *device)
+{
+ struct fujitsu_bl *fujitsu_bl = acpi_driver_data(device);
+ struct input_dev *input;
+ int error;
+
+ fujitsu_bl->input = input = input_allocate_device();
+ if (!input)
+ return -ENOMEM;
+
+ snprintf(fujitsu_bl->phys, sizeof(fujitsu_bl->phys),
+ "%s/video/input0", acpi_device_hid(device));
+
+ input->name = acpi_device_name(device);
+ input->phys = fujitsu_bl->phys;
+ input->id.bustype = BUS_HOST;
+ input->id.product = 0x06;
+ input->dev.parent = &device->dev;
+ input->evbit[0] = BIT(EV_KEY);
+ set_bit(KEY_BRIGHTNESSUP, input->keybit);
+ set_bit(KEY_BRIGHTNESSDOWN, 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;
+}
+
static int fujitsu_backlight_register(void)
{
struct backlight_properties props = {
@@ -612,7 +647,6 @@ static int fujitsu_backlight_register(void)
static int acpi_fujitsu_bl_add(struct acpi_device *device)
{
int state = 0;
- struct input_dev *input;
int error;
if (!device)
@@ -623,28 +657,9 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS);
device->driver_data = fujitsu_bl;
- fujitsu_bl->input = input = input_allocate_device();
- if (!input) {
- error = -ENOMEM;
- goto err_stop;
- }
-
- snprintf(fujitsu_bl->phys, sizeof(fujitsu_bl->phys),
- "%s/video/input0", acpi_device_hid(device));
-
- input->name = acpi_device_name(device);
- input->phys = fujitsu_bl->phys;
- input->id.bustype = BUS_HOST;
- input->id.product = 0x06;
- input->dev.parent = &device->dev;
- input->evbit[0] = BIT(EV_KEY);
- set_bit(KEY_BRIGHTNESSUP, input->keybit);
- set_bit(KEY_BRIGHTNESSDOWN, input->keybit);
- set_bit(KEY_UNKNOWN, input->keybit);
-
- error = input_register_device(input);
+ error = acpi_fujitsu_bl_input_setup(device);
if (error)
- goto err_free_input_dev;
+ goto err_stop;
error = acpi_bus_update_power(fujitsu_bl->acpi_handle, &state);
if (error) {
@@ -695,10 +710,7 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
return 0;
err_unregister_input_dev:
- input_unregister_device(input);
- input = NULL;
-err_free_input_dev:
- input_free_device(input);
+ input_unregister_device(fujitsu_bl->input);
err_stop:
return error;
}
--
2.12.0
next prev parent reply other threads:[~2017-03-20 12:47 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 ` Michał Kępień [this message]
2017-03-29 19:54 ` [PATCH 1/8] platform/x86: fujitsu-laptop: move backlight input device setup to a separate function 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 ` [PATCH 5/8] platform/x86: fujitsu-laptop: switch to a managed hotkey input device Michał Kępień
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-2-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