From patchwork Mon Jul 23 15:05:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanno Zulla X-Patchwork-Id: 10540487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 947B0157A for ; Mon, 23 Jul 2018 15:05:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83616204FB for ; Mon, 23 Jul 2018 15:05:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77DF92864A; Mon, 23 Jul 2018 15:05:48 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 7112A204FB for ; Mon, 23 Jul 2018 15:05:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388176AbeGWQHZ (ORCPT ); Mon, 23 Jul 2018 12:07:25 -0400 Received: from zoot.epublica.de ([78.46.103.157]:49802 "EHLO zoot.epublica.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387852AbeGWQHZ (ORCPT ); Mon, 23 Jul 2018 12:07:25 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by zoot.epublica.de (Postfix) with ESMTP id EA3A41841773; Mon, 23 Jul 2018 17:05:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at zoot.epublica.de Received: from zoot.epublica.de ([127.0.0.1]) by localhost (zoot.epublica.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jqneecZY_qvy; Mon, 23 Jul 2018 17:05:44 +0200 (CEST) Received: from [10.1.0.41] (ip1f103e43.dynamic.kabel-deutschland.de [31.16.62.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by zoot.epublica.de (Postfix) with ESMTPSA id 11C6E1841772; Mon, 23 Jul 2018 17:05:44 +0200 (CEST) Subject: [PATCH v2 3/5] HID: hid-betopff.c: Refactor code to fix error handling (3/3) From: Hanno Zulla To: huangbobupt@163.com Cc: Jiri Kosina , Benjamin Tissoires , linux-input References: <84e73143-a5da-9e8d-4ec8-ce425e1b4699@hanno.de> <3865de51-b659-c24f-6394-6934f004dccd@hanno.de> <386e2cdd-49ec-fe4c-ead7-78dc5384cab9@hanno.de> Message-ID: <05803eec-3fa5-61fb-2129-991b15bc8618@hanno.de> Date: Mon, 23 Jul 2018 17:05:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <386e2cdd-49ec-fe4c-ead7-78dc5384cab9@hanno.de> Content-Language: de-LU Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP HID: hid-betopff.c: Refactor code to fix error handling (3/3) The driver's betopff_probe() calls betopff_init(), but then doesn't handle the returned errors. This is a minor refactoring to fold both functions into one and bring back error handling. Signed-off-by: Hanno Zulla --- drivers/hid/hid-betopff.c | 43 +++++++++++++++------------------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/drivers/hid/hid-betopff.c b/drivers/hid/hid-betopff.c index 0ba58f748239..e4e9cbe44515 100644 --- a/drivers/hid/hid-betopff.c +++ b/drivers/hid/hid-betopff.c @@ -55,7 +55,7 @@ static int hid_betopff_play(struct input_dev *dev, void *data, return 0; } -static int betopff_init(struct hid_device *hdev) +static int betop_probe(struct hid_device *hdev, const struct hid_device_id *id) { struct betopff_device *betopff; struct hid_report *report; @@ -65,6 +65,21 @@ static int betopff_init(struct hid_device *hdev) int error; int i, j; + if (id->driver_data) + hdev->quirks |= HID_QUIRK_MULTI_INPUT; + + error = hid_parse(hdev); + if (error) { + hid_err(hdev, "parse failed\n"); + return error; + } + + error = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); + if (error) { + hid_err(hdev, "hw start failed\n"); + return error; + } + report_list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list; if (list_empty(report_list)) { hid_err(hdev, "no output reports found\n"); @@ -115,32 +130,6 @@ static int betopff_init(struct hid_device *hdev) return 0; } -static int betop_probe(struct hid_device *hdev, const struct hid_device_id *id) -{ - int ret; - - if (id->driver_data) - hdev->quirks |= HID_QUIRK_MULTI_INPUT; - - ret = hid_parse(hdev); - if (ret) { - hid_err(hdev, "parse failed\n"); - goto err; - } - - ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); - if (ret) { - hid_err(hdev, "hw start failed\n"); - goto err; - } - - betopff_init(hdev); - - return 0; -err: - return ret; -} - static const struct hid_device_id betop_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185BFM, 0x2208) }, { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185PC, 0x5506) },