From: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Pavel Skripkin <paskripkin@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
David Laight <david.Laight@aculab.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Michael Straube <straube.linux@gmail.com>,
Martin Kaiser <martin@kaiser.cx>
Cc: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
Subject: [PATCH v10 04/16] staging: r8188eu: reorder comments in usbctrl_vendorreq()
Date: Fri, 24 Sep 2021 14:26:53 +0200 [thread overview]
Message-ID: <20210924122705.3781-5-fmdefrancesco@gmail.com> (raw)
In-Reply-To: <20210924122705.3781-1-fmdefrancesco@gmail.com>
Reorder comments in usbctrl_vendorreq() to follow Linux coding style.
Delete two of them because they are "obvious".
Co-developed-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
---
drivers/staging/r8188eu/hal/usb_ops_linux.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 61a016e3608f..35d268c5cd7f 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -35,9 +35,9 @@ static int usbctrl_vendorreq(struct intf_hdl *intf, u16 value, void *data, u16 l
io_buf = dvobjpriv->usb_vendor_req_buf;
if (requesttype == REALTEK_USB_VENQT_READ)
- pipe = usb_rcvctrlpipe(udev, 0);/* read_in */
+ pipe = usb_rcvctrlpipe(udev, 0);
else
- pipe = usb_sndctrlpipe(udev, 0);/* write_out */
+ pipe = usb_sndctrlpipe(udev, 0);
while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {
if (requesttype == REALTEK_USB_VENQT_READ)
@@ -49,11 +49,13 @@ static int usbctrl_vendorreq(struct intf_hdl *intf, u16 value, void *data, u16 l
requesttype, value, REALTEK_USB_VENQT_CMD_IDX,
io_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
- if (status == len) { /* Success this control transfer. */
+ if (status == len) {
+ /* success */
rtw_reset_continual_urb_error(dvobjpriv);
if (requesttype == REALTEK_USB_VENQT_READ)
memcpy(data, io_buf, len);
- } else { /* error cases */
+ } else {
+ /* error cases */
DBG_88E("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n",
value, (requesttype == REALTEK_USB_VENQT_READ) ? "read" : "write",
len, status, *(u32 *)data, vendorreq_times);
@@ -65,7 +67,8 @@ static int usbctrl_vendorreq(struct intf_hdl *intf, u16 value, void *data, u16 l
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
haldata->srestpriv.wifi_error_status = USB_VEN_REQ_CMD_FAIL;
}
- } else { /* status != len && status >= 0 */
+ } else {
+ /* status != len && status >= 0 */
if (status > 0) {
if (requesttype == REALTEK_USB_VENQT_READ) {
/* For Control read transfer, we have to copy the read data from io_buf to data. */
--
2.33.0
next prev parent reply other threads:[~2021-09-24 12:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 12:26 [PATCH v9 10/16] staging: r8188eu: shorten and simplify calls chains Fabio M. De Francesco
2021-09-24 12:26 ` [PATCH v10 01/16] staging: r8188eu: clean up symbols in usbctrl_vendorreq() Fabio M. De Francesco
2021-09-24 12:26 ` [PATCH v10 02/16] staging: r8188eu: reorder declarations " Fabio M. De Francesco
2021-09-24 12:26 ` [PATCH v10 03/16] staging: r8188eu: remove test " Fabio M. De Francesco
2021-09-24 12:26 ` Fabio M. De Francesco [this message]
2021-09-24 12:26 ` [PATCH v10 05/16] staging: r8188eu: remove a comment from usbctrl_vendorreq() Fabio M. De Francesco
2021-09-24 12:26 ` [PATCH v10 06/16] staging: r8188eu: rename symbols in rtw_read*() and rtw_write*() Fabio M. De Francesco
2021-09-24 12:26 ` [PATCH v10 07/16] staging: r8188eu: remove casts from rtw_{read,write}*() Fabio M. De Francesco
2021-09-24 12:26 ` [PATCH v10 08/16] staging: r8188eu: change the type of a variable in rtw_write16() Fabio M. De Francesco
2021-09-24 12:26 ` [PATCH v10 09/16] staging: r8188eu: remove a buffer from rtw_writeN() Fabio M. De Francesco
2021-09-24 12:26 ` [PATCH v10 10/16] staging: r8188eu: remove a bitwise AND " Fabio M. De Francesco
2021-09-24 12:27 ` [PATCH v10 11/16] staging: r8188eu: change the type of a variable in rtw_read16() Fabio M. De Francesco
2021-09-24 12:27 ` [PATCH v10 12/16] staging: r8188eu: Remove a test from usbctrl_vendorreq() Fabio M. De Francesco
2021-09-24 12:27 ` [PATCH v10 13/16] staging: r8188eu: call new usb_read() from rtw_read{8,16,32}() Fabio M. De Francesco
2021-09-24 12:27 ` [PATCH v10 14/16] staging: r8188eu: call new usb_write() from rtw_write{8,16,32,N}() Fabio M. De Francesco
2021-09-24 12:27 ` [PATCH v10 15/16] staging: r8188eu: remove shared buffer for USB requests Fabio M. De Francesco
2021-09-24 12:27 ` [PATCH v10 16/16] staging: r8188eu: remove mutex 'usb_vendor_req_mutex' Fabio M. De Francesco
2021-09-24 12:37 ` [PATCH v9 10/16] staging: r8188eu: shorten and simplify calls chains Fabio M. De Francesco
2021-09-27 15:37 ` Greg Kroah-Hartman
2021-09-27 16:45 ` Fabio M. De Francesco
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210924122705.3781-5-fmdefrancesco@gmail.com \
--to=fmdefrancesco@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=david.Laight@aculab.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®