staging: rtl8712: rewrite comparisons and remove blank lines
v2 cover staging: rtl8712: rewrite comparisons and remove blank lines
This patchset replaces NULL comparisons with boolean negation and removes extra blank lines after an open brace.
Changes since v1:
- more detailed description of the commit
Zhansaya Bagdauletkyzy (2):
staging: rtl8712: Rewrite NULL comparisons
staging: rtl8712: Remove extra blank lines
drivers/staging/rtl8712/rtl871x_io.h | 1 - drivers/staging/rtl8712/rtl871x_mlme.h | 1 - drivers/staging/rtl8712/rtl871x_recv.h | 11 +++++------ drivers/staging/rtl8712/sta_info.h | 1 - 4 files changed, 5 insertions(+), 9 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/2 staging: rtl8712: Rewrite NULL comparisons
Replace NULL comparisons with boolean negation to be more consistent with the rest of the Linux kernel code base.
Reported by checkpatch.
--- drivers/staging/rtl8712/rtl871x_recv.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8712/rtl871x_recv.h +5 -5
@@ -135,7 +135,7 @@ int recv_func(struct _adapter *padapter, void *pcontext);static inline u8 *get_rxmem (union recv_frame *precvframe) {/* always return rx_head... */ -if (precvframe ==NULL ) +if (!precvframe)return NULL ;return precvframe->u.hdr.rx_head; }
@@ -143,7 +143,7 @@ static inline u8 *get_rxmem(union recv_frame *precvframe)static inline u8 *get_recvframe_data (union recv_frame *precvframe) {/* always return rx_data */ -if (precvframe ==NULL ) +if (!precvframe)return NULL ;return precvframe->u.hdr.rx_data; }
@@ -153,7 +153,7 @@ static inline u8 *recvframe_pull(union recv_frame *precvframe, sint sz)/* used for extract sz bytes from rx_data, update rx_data and return * the updated rx_data to the caller */ -if (precvframe ==NULL ) +if (!precvframe)return NULL ; precvframe->u.hdr.rx_data += sz;if (precvframe->u.hdr.rx_data > precvframe->u.hdr.rx_tail) {
@@ -170,7 +170,7 @@ static inline u8 *recvframe_put(union recv_frame *precvframe, sint sz)* return the updated rx_tail to the caller * after putting, rx_tail must be still larger than rx_end. */ -if (precvframe ==NULL ) +if (!precvframe)return NULL ; precvframe->u.hdr.rx_tail += sz;if (precvframe->u.hdr.rx_tail > precvframe->u.hdr.rx_end) {
@@ -188,7 +188,7 @@ static inline u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz)* updated rx_end to the caller * after pulling, rx_end must be still larger than rx_data. */ -if (precvframe ==NULL ) +if (!precvframe)return NULL ; precvframe->u.hdr.rx_tail -= sz;if (precvframe->u.hdr.rx_tail < precvframe->u.hdr.rx_data) {
Signature · 1 line
2.25.1
PATCH v2 2/2 staging: rtl8712: Remove extra blank lines
In reply to Zhansaya BagdauletkyzyRemove extra blank lines after an open brace to adhere to Linux kernel coding style.
Reported by checkpatch.
--- drivers/staging/rtl8712/rtl871x_io.h | 1 - drivers/staging/rtl8712/rtl871x_mlme.h | 1 - drivers/staging/rtl8712/rtl871x_recv.h | 1 - drivers/staging/rtl8712/sta_info.h | 1 - 4 files changed, 4 deletions(-)
drivers/staging/rtl8712/rtl871x_io.h +0 -1
@@ -123,7 +123,6 @@ struct intf_hdl { };struct reg_protocol_rd { -#ifdef __LITTLE_ENDIAN/* DW1 */ u32 NumOfTrans:4 ;
drivers/staging/rtl8712/rtl871x_mlme.h +0 -1
@@ -77,7 +77,6 @@ struct sitesurvey_ctrl { };struct mlme_priv { -spinlock_t lock;spinlock_t lock2;sint fw_state;/*shall we protect this variable? */
drivers/staging/rtl8712/rtl871x_recv.h +0 -1
@@ -37,7 +37,6 @@ struct smooth_rssi_data { };struct rx_pkt_attrib { -u8 amsdu;u8 order;u8 qos;
drivers/staging/rtl8712/sta_info.h +0 -1
@@ -36,7 +36,6 @@ struct wlan_acl_pool { };struct stainfo_stats { -uint rx_pkts;uint rx_bytes;u64 tx_pkts;
Signature · 1 line
2.25.1
Greg KH
maintainerRe: [PATCH v2 1/2] staging: rtl8712: Rewrite NULL comparisons
In reply to Zhansaya BagdauletkyzyQuoted 8 lines · Zhansaya Bagdauletkyzy
Replace NULL comparisons with boolean negation to be more consistent with the rest of the Linux kernel code base.
Reported by checkpatch.Signed-off-by Zhansaya Bagdauletkyzy <[email protected]>--- drivers/staging/rtl8712/rtl871x_recv.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
This does not apply to my tree :(
Greg KH
maintainerRe: [PATCH v2 2/2] staging: rtl8712: Remove extra blank lines
In reply to Zhansaya BagdauletkyzyQuoted 11 lines · Zhansaya Bagdauletkyzy
Remove extra blank lines after an open brace to adhere to Linux kernel coding style.
Reported by checkpatch.Signed-off-by Zhansaya Bagdauletkyzy <[email protected]>--- drivers/staging/rtl8712/rtl871x_io.h | 1 - drivers/staging/rtl8712/rtl871x_mlme.h | 1 - drivers/staging/rtl8712/rtl871x_recv.h | 1 - drivers/staging/rtl8712/sta_info.h | 1 - 4 files changed, 4 deletions(-)
This does not apply either :(
Re: [PATCH v2 2/2] staging: rtl8712: Remove extra blank lines
Quoted 1 line · On Tuesday, April 6, 2021 at 8:12:48 PM UTC+6 gregkh wrote:
This does not apply either :(
Should I rebase and resend it as a separate patchset, or send as v3? Thanks.
Re: [PATCH v2 2/2] staging: rtl8712: Remove extra blank lines
In reply to Greg KHQuoted 13 lines · On Tuesday, April 6, 2021 at 8:12:48 PM UTC+6 gregkh wrote:
Quoted 11 lines · Zhansaya Bagdauletkyzy
Remove extra blank lines after an open brace to adhere to Linux kernel coding style.
Reported by checkpatch.Signed-off-by Zhansaya Bagdauletkyzy <[email protected]>---
drivers/staging/rtl8712/rtl871x_io.h| 1 -drivers/staging/rtl8712/rtl871x_mlme.h| 1 -drivers/staging/rtl8712/rtl871x_recv.h| 1 -drivers/staging/rtl8712/sta_info.h| 1 -4 files changed, 4 deletions(-)
Quoted 1 line
This does not apply either :(
In my git log, both patches, which did not apply, are in "origin/staging-testing". I accidentally sent the same patchset twice, maybe there is a confusion because of that?
Thanks
Re: [Outreachy kernel] Re: [PATCH v2 2/2] staging: rtl8712: Remove extra blank lines
Quoted 16 lines · Zhansaya Bagdauletkyzy
Quoted 13 lines · On Tuesday, April 6, 2021 at 8:12:48 PM UTC+6 gregkh wrote:
Quoted 11 lines · Zhansaya Bagdauletkyzy
Remove extra blank lines after an open brace to adhere to Linux kernel coding style.
Reported by checkpatch.Signed-off-by Zhansaya Bagdauletkyzy <[email protected]>---
drivers/staging/rtl8712/rtl871x_io.h| 1 -drivers/staging/rtl8712/rtl871x_mlme.h| 1 -drivers/staging/rtl8712/rtl871x_recv.h| 1 -drivers/staging/rtl8712/sta_info.h| 1 -4 files changed, 4 deletions(-)
Quoted 6 lines
Quoted 1 line
This does not apply either :(
In my git log, both patches, which did not apply, are in "origin/staging-testing". I accidentally sent the same patchset twice, maybe there is a confusion because of that?
If I already took your previous patch series, yes, that would be a problem :)
Please rebase on my staging-testing branch and see what is remaining and resend that.
thanks,
greg k-h