| Message ID | 20230905013556.2595854-1-dzm91@hust.edu.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | dc73b20593544f8e1b78dded909296f2777076d0 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] ath9k: clean up function ath9k_hif_usb_resume | expand |
On Tue, Sep 05, 2023 at 09:35:56AM +0800, Dongliang Mu wrote: > 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 <dzm91@hust.edu.cn> > --- > 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; Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> regards, dan carpenter
Dongliang Mu <dzm91@hust.edu.cn> writes: > 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 <dzm91@hust.edu.cn> So it seems this didn't make it to the lists; could you please try re-sending? -Toke
Toke Høiland-Jørgensen <toke@toke.dk> writes: > Dongliang Mu <dzm91@hust.edu.cn> writes: > >> 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 <dzm91@hust.edu.cn> > > So it seems this didn't make it to the lists; could you please try > re-sending? Never mind, it made it through now :) -Toke
Dongliang Mu <dzm91@hust.edu.cn> writes: > 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 <dzm91@hust.edu.cn> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Dongliang Mu <dzm91@hust.edu.cn> wrote: > 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 <dzm91@hust.edu.cn> > Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> > Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. dc73b2059354 wifi: ath9k: clean up function ath9k_hif_usb_resume
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);
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 <dzm91@hust.edu.cn> --- 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;