* [PATCH] staging: rtl8723bs: Fix styling issues
@ 2021-12-18 20:36 Ismayil Mirzali
2021-12-18 20:55 ` Pavel Skripkin
2022-01-05 9:57 ` Dan Carpenter
0 siblings, 2 replies; 3+ messages in thread
From: Ismayil Mirzali @ 2021-12-18 20:36 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, linux-kernel, linux-staging, simon.fodin
Removed extra whitespaces and brackets for oneline if statements
Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 20 ++++++++-----------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index 7fe3df863fe1..7807b2a6cdc5 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -32,7 +32,7 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)
pHalData->SdioTxOQTFreeSpace -= agg_num;
/* if (n > 1) */
- /* ++priv->pshare->nr_out_of_txoqt_space; */
+ /* ++priv->pshare->nr_out_of_txoqt_space; */
return true;
}
@@ -147,13 +147,12 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
return _SUCCESS;
ret = rtw_register_tx_alive(padapter);
- if (ret != _SUCCESS) {
+ if (ret != _SUCCESS)
return _SUCCESS;
- }
do {
queue_empty = rtl8723_dequeue_writeport(padapter);
-/* dump secondary adapter xmitbuf */
+ /* dump secondary adapter xmitbuf */
} while (!queue_empty);
rtw_unregister_tx_alive(padapter);
@@ -311,7 +310,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
pxmitframe->pg_num = (txlen + 127) / 128;
pxmitbuf->pg_num += (txlen + 127) / 128;
/* if (k != 1) */
- /* ((struct xmit_frame*)pxmitbuf->priv_data)->pg_num += pxmitframe->pg_num; */
+ /* ((struct xmit_frame*)pxmitbuf->priv_data)->pg_num += pxmitframe->pg_num; */
pxmitbuf->ptail += _RND(txlen, 8); /* round to 8 bytes alignment */
pxmitbuf->len = _RND(pxmitbuf->len, 8) + txlen;
}
@@ -385,9 +384,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
spin_lock_bh(&pxmitpriv->lock);
ret = rtw_txframes_pending(padapter);
spin_unlock_bh(&pxmitpriv->lock);
- if (ret == 0) {
+ if (ret == 0)
return _SUCCESS;
- }
/* dequeue frame and write to hardware */
@@ -405,9 +403,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
spin_lock_bh(&pxmitpriv->lock);
ret = rtw_txframes_pending(padapter);
spin_unlock_bh(&pxmitpriv->lock);
- if (ret == 1) {
+ if (ret == 1)
goto next;
- }
return _SUCCESS;
}
@@ -428,10 +425,9 @@ int rtl8723bs_xmit_thread(void *context)
do {
ret = rtl8723bs_xmit_handler(padapter);
- if (signal_pending(current)) {
+ if (signal_pending(current))
flush_signals(current);
- }
- } while (_SUCCESS == ret);
+ } while (ret == _SUCCESS);
complete(&pxmitpriv->SdioXmitTerminate);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] staging: rtl8723bs: Fix styling issues
2021-12-18 20:36 [PATCH] staging: rtl8723bs: Fix styling issues Ismayil Mirzali
@ 2021-12-18 20:55 ` Pavel Skripkin
2022-01-05 9:57 ` Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Pavel Skripkin @ 2021-12-18 20:55 UTC (permalink / raw)
To: Ismayil Mirzali, gregkh
Cc: Larry.Finger, linux-kernel, linux-staging, simon.fodin
On 12/18/21 23:36, Ismayil Mirzali wrote:
> Removed extra whitespaces and brackets for oneline if statements
>
> Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>
> ---
> .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 20 ++++++++-----------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> index 7fe3df863fe1..7807b2a6cdc5 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> @@ -32,7 +32,7 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)
> pHalData->SdioTxOQTFreeSpace -= agg_num;
>
> /* if (n > 1) */
> - /* ++priv->pshare->nr_out_of_txoqt_space; */
> + /* ++priv->pshare->nr_out_of_txoqt_space; */
>
I believe, commented code should be just removed
> return true;
> }
[...]
> rtw_unregister_tx_alive(padapter);
> @@ -311,7 +310,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
> pxmitframe->pg_num = (txlen + 127) / 128;
> pxmitbuf->pg_num += (txlen + 127) / 128;
> /* if (k != 1) */
> - /* ((struct xmit_frame*)pxmitbuf->priv_data)->pg_num += pxmitframe->pg_num; */
> + /* ((struct xmit_frame*)pxmitbuf->priv_data)->pg_num += pxmitframe->pg_num; */
>
Same here
With regards,
Pavel Skripkin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: rtl8723bs: Fix styling issues
2021-12-18 20:36 [PATCH] staging: rtl8723bs: Fix styling issues Ismayil Mirzali
2021-12-18 20:55 ` Pavel Skripkin
@ 2022-01-05 9:57 ` Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2022-01-05 9:57 UTC (permalink / raw)
To: Ismayil Mirzali
Cc: gregkh, Larry.Finger, linux-kernel, linux-staging, simon.fodin
On Sat, Dec 18, 2021 at 10:36:47PM +0200, Ismayil Mirzali wrote:
> Removed extra whitespaces and brackets for oneline if statements
s/oneline/one line/.
Do this in two separate patches.
>
> Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>
> ---
> .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 20 ++++++++-----------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> index 7fe3df863fe1..7807b2a6cdc5 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> @@ -32,7 +32,7 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)
> pHalData->SdioTxOQTFreeSpace -= agg_num;
>
> /* if (n > 1) */
> - /* ++priv->pshare->nr_out_of_txoqt_space; */
> + /* ++priv->pshare->nr_out_of_txoqt_space; */
Just delete dead code.
>
> return true;
> }
> @@ -147,13 +147,12 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
> return _SUCCESS;
>
> ret = rtw_register_tx_alive(padapter);
> - if (ret != _SUCCESS) {
> + if (ret != _SUCCESS)
> return _SUCCESS;
> - }
>
> do {
> queue_empty = rtl8723_dequeue_writeport(padapter);
> -/* dump secondary adapter xmitbuf */
> + /* dump secondary adapter xmitbuf */
> } while (!queue_empty);
>
> rtw_unregister_tx_alive(padapter);
> @@ -311,7 +310,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
> pxmitframe->pg_num = (txlen + 127) / 128;
> pxmitbuf->pg_num += (txlen + 127) / 128;
> /* if (k != 1) */
> - /* ((struct xmit_frame*)pxmitbuf->priv_data)->pg_num += pxmitframe->pg_num; */
> + /* ((struct xmit_frame*)pxmitbuf->priv_data)->pg_num += pxmitframe->pg_num; */
Delete.
> pxmitbuf->ptail += _RND(txlen, 8); /* round to 8 bytes alignment */
> pxmitbuf->len = _RND(pxmitbuf->len, 8) + txlen;
> }
> @@ -385,9 +384,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
> spin_lock_bh(&pxmitpriv->lock);
> ret = rtw_txframes_pending(padapter);
> spin_unlock_bh(&pxmitpriv->lock);
> - if (ret == 0) {
> + if (ret == 0)
> return _SUCCESS;
> - }
>
> /* dequeue frame and write to hardware */
>
> @@ -405,9 +403,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
> spin_lock_bh(&pxmitpriv->lock);
> ret = rtw_txframes_pending(padapter);
> spin_unlock_bh(&pxmitpriv->lock);
> - if (ret == 1) {
> + if (ret == 1)
> goto next;
> - }
>
> return _SUCCESS;
> }
> @@ -428,10 +425,9 @@ int rtl8723bs_xmit_thread(void *context)
>
> do {
> ret = rtl8723bs_xmit_handler(padapter);
> - if (signal_pending(current)) {
> + if (signal_pending(current))
> flush_signals(current);
> - }
> - } while (_SUCCESS == ret);
> + } while (ret == _SUCCESS);
This change was not described in the commit message.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-05 9:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-18 20:36 [PATCH] staging: rtl8723bs: Fix styling issues Ismayil Mirzali
2021-12-18 20:55 ` Pavel Skripkin
2022-01-05 9:57 ` Dan Carpenter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.