From patchwork Tue Sep 5 01:35:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 137531 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1800550vqo; Tue, 5 Sep 2023 09:42:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTEjy5t/harjfdExmmQiegiXanpQHa96sNnl0xke8079m8Ado7LuzRnEGJJ17vHOlOjWqm X-Received: by 2002:a17:902:e54e:b0:1bd:a0cd:1860 with SMTP id n14-20020a170902e54e00b001bda0cd1860mr11589224plf.64.1693932148934; Tue, 05 Sep 2023 09:42:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693932148; cv=none; d=google.com; s=arc-20160816; b=VeV5Uh6/VIjqLrTHEBwCghFGqeu2IiuXfKTRqkCYrcoNfe93oJBOWMeF1eIRwGQwmK ZAl/vTZDs2iQQLn+SHeVe9B22Bwkio0yNODHOJnUbFR+VneSu4Ii8pO1wp8SOzQLHg40 WTxO1PWKdeqMR0eVYTqFcmEYGumIm3hsN1nvC/UIvaIWy6EyTIxA/d5k1wCWVI3ZRcB/ jmSjMfrRKK+MJ848YOTWHIf68TtDOPGlQuAyC0Jq3j/ljGHOXLq74Rd+1c6jSjaHnwpk zGcT05AIWwQxj6bHMiU5fPq5BNPED0GR9Hwti2qYwSluyUUZTSmnwnxdtvInoLhtFf8E bxWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=W2gJPCR7T7uHTLY+rS2iQG6PZgKFM4MlihRDzo8DOMw=; fh=FDnUkOaEzm15K0Zz2pRbIY6ufBa8VWjoRjVlaBxAYMM=; b=YZXOE+nUmKCJ7sPXERIt9VHywL74N2p+vwLTAdvJqW9oUNciQd8pIgheodYpLEH99j 3CKdLunYk3I0LcKaLjuboRyL24kl8a2wThnfYKmMkcRaL/gq7mwFJ9eTG2umYwcxje+w ZvFsGAbNXbioWvUSzKYgoYcBWV0sk4yiwjqJntF4T1kHTlF8A0YZ97K8JpMdWF96sL3d ur9x0coKbWjsmnfgdiEJ7emMmrVmSIjz5UzY2JGOitbDkn2eKbmhpCYYNp1ccHKblphU 7BPZKiYWKNWGXa24djFoNDwwU09b1V9Gu0QhV0nwDzU4zJ171Nb1AGdY07f0/qiwTPOX k5dg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d2-20020a170902654200b001b9e2ce5723si9563201pln.495.2023.09.05.09.42.19; Tue, 05 Sep 2023 09:42:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347517AbjIEQR7 (ORCPT + 37 others); Tue, 5 Sep 2023 12:17:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244933AbjIEBhN (ORCPT ); Mon, 4 Sep 2023 21:37:13 -0400 Received: from hust.edu.cn (unknown [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2210ACC6; Mon, 4 Sep 2023 18:37:08 -0700 (PDT) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 3851Zw19019535-3851Zw1A019535 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 5 Sep 2023 09:36:08 +0800 From: Dongliang Mu To: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Kalle Valo Cc: hust-os-kernel-patches@googlegroups.com, Dongliang Mu , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ath9k: clean up function ath9k_hif_usb_resume Date: Tue, 5 Sep 2023 09:35:56 +0800 Message-Id: <20230905013556.2595854-1-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776216597104747361 X-GMAIL-MSGID: 1776216597104747361 In ath9k_hif_usb_resume, the error handling code calls ath9k_hif_usb_dealloc_urbs twice in different paths. To unify the error handling code, we move the else branch before the if branch and drop one level of indentation of the if branch. In addition, move the ret variable at the end of variable declarations to be reverse x-mas tree order. Note that this patch does not incur any functionability change. Signed-off-by: Dongliang Mu --- drivers/net/wireless/ath/ath9k/hif_usb.c | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) v1->v2: move the else branch on top of if branch; move ret variable at the end of variable declarations; diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index e5414435b141..90cfe39aa433 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -1481,31 +1481,31 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface) { struct hif_device_usb *hif_dev = usb_get_intfdata(interface); struct htc_target *htc_handle = hif_dev->htc_handle; - int ret; const struct firmware *fw; + int ret; ret = ath9k_hif_usb_alloc_urbs(hif_dev); if (ret) return ret; - if (hif_dev->flags & HIF_USB_READY) { - /* request cached firmware during suspend/resume cycle */ - ret = request_firmware(&fw, hif_dev->fw_name, - &hif_dev->udev->dev); - if (ret) - goto fail_resume; - - hif_dev->fw_data = fw->data; - hif_dev->fw_size = fw->size; - ret = ath9k_hif_usb_download_fw(hif_dev); - release_firmware(fw); - if (ret) - goto fail_resume; - } else { - ath9k_hif_usb_dealloc_urbs(hif_dev); - return -EIO; + if (!(hif_dev->flags & HIF_USB_READY)) { + ret = -EIO; + goto fail_resume; } + /* request cached firmware during suspend/resume cycle */ + ret = request_firmware(&fw, hif_dev->fw_name, + &hif_dev->udev->dev); + if (ret) + goto fail_resume; + + hif_dev->fw_data = fw->data; + hif_dev->fw_size = fw->size; + ret = ath9k_hif_usb_download_fw(hif_dev); + release_firmware(fw); + if (ret) + goto fail_resume; + mdelay(100); ret = ath9k_htc_resume(htc_handle);