From patchwork Mon Mar 20 09:32:20 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: 9634071 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 4A0D86020B for ; Mon, 20 Mar 2017 12:49:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A1352808F for ; Mon, 20 Mar 2017 12:49:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DF402843A; Mon, 20 Mar 2017 12:49:56 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI 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 A07D127C05 for ; Mon, 20 Mar 2017 12:49:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754855AbdCTMrk (ORCPT ); Mon, 20 Mar 2017 08:47:40 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:36450 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753328AbdCTJcc (ORCPT ); Mon, 20 Mar 2017 05:32:32 -0400 Received: by mail-lf0-f67.google.com with SMTP id g70so9590633lfh.3 for ; Mon, 20 Mar 2017 02:32:30 -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=+XdU/rNVcfGz13vPizoPgjZCtM1kvy3TQNTn4ySGSZs=; b=o5+YijZajXjdP8wOU+ZxSKJuzEwh+8+3zNwuSD7YoXpdfOmXfvtRuyigqxl768T8JS Uzk/feUjvvS4ry31O+SNFiHOrcU59gM7/w3NksbkRtZ7FOx/WL3vS6sdMKBqZi3az+nA j7wfwCTh5VaMJVg9LyWZqCGzT2HGJJo2f4VXk= 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=+XdU/rNVcfGz13vPizoPgjZCtM1kvy3TQNTn4ySGSZs=; b=VAonnnuSuLAaDw0zrJv9jwr/2ZrlmbzlRT9shJtrG6uZTFXwABLey043G7v7wucNpW xl++3YqRm7yARpbyFHtuakzJFLF8ryOARz3gOFoHRScwAlkWa0U9s1THUuzx+rN/7PF9 Il3+ejSW/koXZ5uEkibdS0Y2UCOLbXqivyRJ21w2Fs3clsDwyFg3IhbR8FUVOtO5HHB1 o1KA4atbmKshFUkNmlvZHfoOJoQ2//wPO8GlCJr8BLAc0Z/ptK9ECVr5CHMXVS3EHiND RCkZCNDglgeLjcq/AHJ0tRtL4O/4TW2v23ORLDXujJUErh04JquFVCXvAfXk85Uu6GFc cdEQ== X-Gm-Message-State: AFeK/H1lfqM3THbr92+wMQirp+Zxn4QswZRUtD09YJWM6wFxXBFz88dlvWWngHgUkdVCig== X-Received: by 10.25.192.5 with SMTP id q5mr7781029lff.38.1490002350086; Mon, 20 Mar 2017 02:32:30 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 02:32:29 -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 4/8] platform/x86: fujitsu-laptop: move hotkey input device setup to a separate function Date: Mon, 20 Mar 2017 10:32:20 +0100 Message-Id: <20170320093224.18541-5-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_laptop_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 | 74 ++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 3483ac37bee5..b1a08d83330b 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -756,6 +756,46 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) /* ACPI device for hotkey handling */ +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) + 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; +} + static int fujitsu_laptop_platform_add(void) { int ret; @@ -794,7 +834,6 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) { int result = 0; int state = 0; - struct input_dev *input; int error; int i; @@ -816,33 +855,9 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) goto err_stop; } - fujitsu_laptop->input = input = input_allocate_device(); - if (!input) { - error = -ENOMEM; - goto err_free_fifo; - } - - 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); + error = acpi_fujitsu_laptop_input_setup(device); if (error) - goto err_free_input_dev; + goto err_free_fifo; error = acpi_bus_update_power(fujitsu_laptop->acpi_handle, &state); if (error) { @@ -960,10 +975,7 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) return result; err_unregister_input_dev: - input_unregister_device(input); - input = NULL; -err_free_input_dev: - input_free_device(input); + input_unregister_device(fujitsu_laptop->input); err_free_fifo: kfifo_free(&fujitsu_laptop->fifo); err_stop: