From patchwork Mon Jul 23 15:04:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanno Zulla X-Patchwork-Id: 10540485 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 91EF9157A for ; Mon, 23 Jul 2018 15:04:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80076204FB for ; Mon, 23 Jul 2018 15:04:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 726ED27F97; Mon, 23 Jul 2018 15:04:45 +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 191D0204FB for ; Mon, 23 Jul 2018 15:04:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388047AbeGWQGW (ORCPT ); Mon, 23 Jul 2018 12:06:22 -0400 Received: from zoot.epublica.de ([78.46.103.157]:49726 "EHLO zoot.epublica.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387963AbeGWQGW (ORCPT ); Mon, 23 Jul 2018 12:06:22 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by zoot.epublica.de (Postfix) with ESMTP id 7A7811841775; Mon, 23 Jul 2018 17:04:42 +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 BRbLwdwec5X3; Mon, 23 Jul 2018 17:04:41 +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 7A9491841772; Mon, 23 Jul 2018 17:04:41 +0200 (CEST) Subject: [PATCH v2 2/5] HID: hid-betopff.c: Refactor code to fix error handling (2/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> Message-ID: <386e2cdd-49ec-fe4c-ead7-78dc5384cab9@hanno.de> Date: Mon, 23 Jul 2018 17:04:40 +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: <3865de51-b659-c24f-6394-6934f004dccd@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 (2/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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/hid/hid-betopff.c b/drivers/hid/hid-betopff.c index 5b4c9e9d26ae..0ba58f748239 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 *hid) +static int betopff_init(struct hid_device *hdev) { struct betopff_device *betopff; struct hid_report *report; @@ -65,9 +65,9 @@ static int betopff_init(struct hid_device *hid) int error; int i, j; - report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list; + report_list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list; if (list_empty(report_list)) { - hid_err(hid, "no output reports found\n"); + hid_err(hdev, "no output reports found\n"); return -ENODEV; } @@ -88,7 +88,7 @@ static int betopff_init(struct hid_device *hid) } if (field_count < 4) { - hid_err(hid, "not enough fields in the report: %d\n", + hid_err(hdev, "not enough fields in the report: %d\n", field_count); return -ENODEV; } @@ -97,7 +97,7 @@ static int betopff_init(struct hid_device *hid) if (!betopff) return -ENOMEM; - hidinput = list_first_entry(&hid->inputs, struct hid_input, list); + hidinput = list_first_entry(&hdev->inputs, struct hid_input, list); set_bit(FF_RUMBLE, hidinput->input->ffbit); error = input_ff_create_memless(hidinput->input, @@ -108,9 +108,9 @@ static int betopff_init(struct hid_device *hid) } betopff->report = report; - hid_hw_request(hid, betopff->report, HID_REQ_SET_REPORT); + hid_hw_request(hdev, betopff->report, HID_REQ_SET_REPORT); - hid_info(hid, "Force feedback for betop devices by huangbo \n"); + hid_info(hdev, "Force feedback for betop devices by huangbo \n"); return 0; }