From 7d134e43a2ac729888bb752f8dba5f8bbb5c938a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Mon, 20 Mar 2017 10:32:17 +0100 Subject: [PATCH] platform/x86: fujitsu-laptop: refactor backlight input device setup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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ń Reviewed-by: Jonathan Woithe Signed-off-by: Darren Hart (VMware) --- 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.39.5