staging: rtl8723bs: remove a stray blank line in xmit_linux.c
PATCH 1/3 staging: rtl8723bs: remove a stray blank line in xmit_linux.c
There are two consecutive blank lines after the #include. Remove the extra one.
No functional change.
--- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +0 -1
@@ -6,7 +6,6 @@******************************************************************************/ #include <drv_types.h> -uint rtw_remainder_len (struct pkt_file *pfile) {return (pfile->buf_len - ((SIZE_PTR )(pfile->cur_addr) - (SIZE_PTR )(pfile->buf_start)));
Signature · 1 line
2.53.0
PATCH 2/3 staging: rtl8723bs: split chained assignments in _rtw_open_pktfile()
Split the two chained assignments into separate statements, one variable per line, preserving the original assignment order.
No functional change.
--- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +4 -2
@@ -14,8 +14,10 @@ uint rtw_remainder_len(struct pkt_file *pfile)void _rtw_open_pktfile (struct sk_buff *pktptr,struct pkt_file *pfile) { pfile->pkt = pktptr; - pfile->cur_addr = pfile->buf_start = pktptr->data; - pfile->pkt_len = pfile->buf_len = pktptr->len; + pfile->buf_start = pktptr->data; + pfile->cur_addr = pfile->buf_start; + pfile->buf_len = pktptr->len; + pfile->pkt_len = pfile->buf_len; pfile->cur_buffer = pfile->buf_start; }
Signature · 1 line
2.53.0
Greg KH
maintainerRe: [PATCH 2/3] staging: rtl8723bs: split chained assignments in _rtw_open_pktfile()
Quoted 15 lines · Godana Emiru
Split the two chained assignments into separate statements, one variable per line, preserving the original assignment order.
No functional change.
Signed-off-by Godana Emiru <[email protected]>--- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/staging/rtl8723bs/os_dep/xmit_linux.c +0
-0
drivers/staging/rtl8723bs/os_dep/xmit_linux.c uint rtw_remainder_len(struct pkt_file *pfile) · line 20
Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +4
-2@@ -14,8 +14,10 @@ uint rtw_remainder_len(struct pkt_file *pfile)void _rtw_open_pktfile (struct sk_buff *pktptr,struct pkt_file *pfile) { pfile->pkt = pktptr; - pfile->cur_addr = pfile->buf_start = pktptr->data; - pfile->pkt_len = pfile->buf_len = pktptr->len; + pfile->buf_start = pktptr->data; + pfile->cur_addr = pfile->buf_start; + pfile->buf_len = pktptr->len; + pfile->pkt_len = pfile->buf_len;
This is harder to read now, right? Please see the archives for a suggestion as to how to make this more understandable.
thanks,
greg k-h
PATCH v2 1/1 staging: rtl8723bs: split chained assignments in _rtw_open_pktfile()
In reply to Godana EmiruFix a checkpatch CHECK ("multiple assignments should be avoided") by splitting the two chained assignments into separate statements.
Assign cur_addr and buf_start directly from pktptr->data, and pkt_len and buf_len directly from pktptr->len, rather than chaining one field through the other. This avoids making the reader trace a dependency between the two assignments to see that they end up with the same value.
No functional change.
---
v2: Assign each field directly from its source value (pktptr->data /
pktptr->len) instead of chaining one field's assignment through the other, per Greg's review comment that the v1 split was harder to read than the original.
drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +4 -2
@@ -14,8 +14,10 @@ uint rtw_remainder_len(struct pkt_file *pfile)void _rtw_open_pktfile (struct sk_buff *pktptr,struct pkt_file *pfile) { pfile->pkt = pktptr; - pfile->cur_addr = pfile->buf_start = pktptr->data; - pfile->pkt_len = pfile->buf_len = pktptr->len; + pfile->buf_start = pktptr->data; + pfile->cur_addr = pktptr->data; + pfile->buf_len = pktptr->len; + pfile->pkt_len = pktptr->len; pfile->cur_buffer = pfile->buf_start; }
Signature · 1 line
2.53.0
Greg KH
maintainerRe: [PATCH v2] staging: rtl8723bs: split chained assignments in _rtw_open_pktfile()
Quoted 41 lines · Godana Emiru
Fix a checkpatch CHECK ("multiple assignments should be avoided") by splitting the two chained assignments into separate statements.
Assign
cur_addrandbuf_startdirectly frompktptr->data, andpkt_lenandbuf_lendirectly frompktptr->len, rather than chaining one field through the other. This avoids making the reader trace a dependency between the two assignments to see that they end up with the same value.No functional change.
Signed-off-by Godana Emiru <[email protected]>---
v2: Assign each field directly from its source value (pktptr->data/
pktptr->len) instead of chaining one field's assignment through the other, per Greg's review comment that the v1 split was harder to read than the original.drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/staging/rtl8723bs/os_dep/xmit_linux.c +4
-2@@ -14,8 +14,10 @@ uint rtw_remainder_len(struct pkt_file *pfile)void _rtw_open_pktfile (struct sk_buff *pktptr,struct pkt_file *pfile) { pfile->pkt = pktptr; - pfile->cur_addr = pfile->buf_start = pktptr->data; - pfile->pkt_len = pfile->buf_len = pktptr->len; + pfile->buf_start = pktptr->data; + pfile->cur_addr = pktptr->data; + pfile->buf_len = pktptr->len; + pfile->pkt_len = pktptr->len; pfile->cur_buffer = pfile->buf_start; }Signature · 1 line
2.53.0
This was already done in the 7.3-rc1 kernel release in commit cb08dcd0a896 ("staging: rtl8723bs: Split multiple assignments in _rtw_open_pktfile"), sorry.
thanks,
greg k-h
PATCH 3/3 staging: rtl8723bs: wrap long prototype of rtw_os_xmit_resource_free()
In reply to Godana EmiruThe function prototype exceeds the column limit. Wrap it onto two lines, aligned to the open parenthesis.
No functional change.
--- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +2 -1
@@ -49,7 +49,8 @@ signed int rtw_endofpktfile(struct pkt_file *pfile)return false; } -void rtw_os_xmit_resource_free (struct adapter *padapter,struct xmit_buf *pxmitbuf,u32 free_sz,u8 flag) +void rtw_os_xmit_resource_free (struct adapter *padapter,struct xmit_buf *pxmitbuf, +u32 free_sz,u8 flag) {if (free_sz >0 )kfree (pxmitbuf->pallocated_buf);
Signature · 1 line
2.53.0