From patchwork Mon Mar 20 09:32:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9634065 X-Patchwork-Delegate: dvhart@infradead.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8604160327 for ; Mon, 20 Mar 2017 12:49:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7754827C05 for ; Mon, 20 Mar 2017 12:49:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C54227FA7; Mon, 20 Mar 2017 12:49:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C9EF27C2D for ; Mon, 20 Mar 2017 12:49:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755059AbdCTMrn (ORCPT ); Mon, 20 Mar 2017 08:47:43 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33229 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753172AbdCTJc3 (ORCPT ); Mon, 20 Mar 2017 05:32:29 -0400 Received: by mail-lf0-f65.google.com with SMTP id r36so9627067lfi.0 for ; Mon, 20 Mar 2017 02:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JWd8JgGlVeDChY7xm9YlDcF8k/bKBsAQot/KD371QpU=; b=kWf7COXPTzXmwJsuptGnz3UI6MYRTyF0pAJejTpmzupM5u7t+ns6NyU6Td5vaFy/6I 1e2esVqUzQTLXNS0mNcTXuNFDDV55oRkvouA/Y8SrolFXgahQwSGjhOsqlET+oOXboBv KrtM3+zBF3y7W7CNSCGp57131uw9AnABdYGN8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JWd8JgGlVeDChY7xm9YlDcF8k/bKBsAQot/KD371QpU=; b=LYT5WPU9MipdnkGiaikO+V+iamXsRdThMmwU4KSFIg4XsZ9PLT/g+P0HEkFRDG2vQC MXKoOOzG22qkB3bBPPwriNR6vjrEcNxZWTGkAW+WjcnLS6HaCNK0zEsmx6bE0gP3KQzf evZ/c14J/cuLXw8zs+Wffn64ejZPWpWf71qNREhLetHAJfwPngHc1MLOaRGyEpH5zf7R +pco4t+wnNehl0DYJVv77kbRlelJ440s3it58r0CBxdAXjdzO/0ng9KeXk9ldRns/Wzb aa4czQk/2gYIwf6Z9OSR7ajXCUMhEl+HVYT8AJS0MopGVWxVBSn9uC4viuFMWSa16YIt OAkA== X-Gm-Message-State: AFeK/H0r/xA+xrqB8jjpJdxm1W7SChdZ7JtA0CI6eR0ZNz5/B7YfTmfXBPiblkWNFE4Epw== X-Received: by 10.25.196.203 with SMTP id u194mr6724072lff.37.1490002347596; Mon, 20 Mar 2017 02:32:27 -0700 (PDT) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id 4sm2918755ljf.33.2017.03.20.02.32.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 02:32:27 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart , Andy Shevchenko 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 Message-Id: <20170320093224.18541-2-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170320093224.18541-1-kernel@kempniu.pl> References: <20170320093224.18541-1-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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ń --- 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; }