* [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch
@ 2022-04-21 19:20 Jaehee Park
2022-04-21 19:20 ` [PATCH v4 1/7] staging: r8188eu: remove unnecessary braces in single statement block Jaehee Park
` (6 more replies)
0 siblings, 7 replies; 12+ messages in thread
From: Jaehee Park @ 2022-04-21 19:20 UTC (permalink / raw)
To: Larry.Finger
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013
These patches address style issues found by checkpatch in the
core/rtw_mlme.c file.
Jaehee Park (7):
staging: r8188eu: remove unnecessary braces in single statement block
staging: r8188eu: remove spaces before tabs
staging: r8188eu: remove 'added by' author comments
staging: r8188eu: place constants on the right side of tests
staging: r8188eu: replace spaces with tabs
staging: r8188eu: correct typo in comments
staging: r8188eu: remove unused else condition
drivers/staging/r8188eu/core/rtw_mlme.c | 45 +++++++++++--------------
1 file changed, 19 insertions(+), 26 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v4 1/7] staging: r8188eu: remove unnecessary braces in single statement block
2022-04-21 19:20 [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch Jaehee Park
@ 2022-04-21 19:20 ` Jaehee Park
2022-04-21 19:52 ` Fabio M. De Francesco
2022-04-21 19:20 ` [PATCH v4 2/7] staging: r8188eu: remove spaces before tabs Jaehee Park
` (5 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Jaehee Park @ 2022-04-21 19:20 UTC (permalink / raw)
To: Larry.Finger
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013
Remove braces for single statement block to minimize the number of
empty lines, without loss of readability. Issue found with checkpatch.
WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 3e9882f89f76..d3f4d7cdfa08 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -112,9 +112,8 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
rtw_free_mlme_priv_ie_data(pmlmepriv);
- if (pmlmepriv) {
+ if (pmlmepriv)
vfree(pmlmepriv->free_bss_buf);
- }
}
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v4 2/7] staging: r8188eu: remove spaces before tabs
2022-04-21 19:20 [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch Jaehee Park
2022-04-21 19:20 ` [PATCH v4 1/7] staging: r8188eu: remove unnecessary braces in single statement block Jaehee Park
@ 2022-04-21 19:20 ` Jaehee Park
2022-04-21 19:20 ` [PATCH v4 3/7] staging: r8188eu: remove 'added by' author comments Jaehee Park
` (4 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Jaehee Park @ 2022-04-21 19:20 UTC (permalink / raw)
To: Larry.Finger
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013
Delete spaces before tabs in the comments. Issue found with checkpatch.
WARNING: please, no space before tabs
Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index d3f4d7cdfa08..2cfd8e8d74a4 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -573,8 +573,8 @@ static void rtw_add_network(struct adapter *adapter,
/* select the desired network based on the capability of the (i)bss. */
/* check items: (1) security */
-/* (2) network_type */
-/* (3) WMM */
+/* (2) network_type */
+/* (3) WMM */
/* (4) HT */
/* (5) others */
static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork)
@@ -909,9 +909,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
memset((u8 *)&psta->dot11txpn, 0, sizeof(union pn48));
memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48));
}
- /* Commented by Albert 2012/07/21 */
- /* When doing the WPS, the wps_ie_len won't equal to 0 */
- /* And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted. */
+ /* Commented by Albert 2012/07/21 */
+ /* When doing the WPS, the wps_ie_len won't equal to 0 */
+ /* And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted. */
if (padapter->securitypriv.wps_ie_len != 0) {
psta->ieee8021x_blocked = true;
padapter->securitypriv.wps_ie_len = 0;
@@ -1634,8 +1634,8 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
/* */
/* Search by BSSID, */
/* Return Value: */
-/* -1 :if there is no pre-auth key in the table */
-/* >= 0 :if there is pre-auth key, and return the entry id */
+/* -1 :if there is no pre-auth key in the table */
+/* >= 0 :if there is pre-auth key, and return the entry id */
/* */
/* */
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v4 3/7] staging: r8188eu: remove 'added by' author comments
2022-04-21 19:20 [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch Jaehee Park
2022-04-21 19:20 ` [PATCH v4 1/7] staging: r8188eu: remove unnecessary braces in single statement block Jaehee Park
2022-04-21 19:20 ` [PATCH v4 2/7] staging: r8188eu: remove spaces before tabs Jaehee Park
@ 2022-04-21 19:20 ` Jaehee Park
2022-04-21 19:20 ` [PATCH v4 4/7] staging: r8188eu: place constants on the right side of tests Jaehee Park
` (3 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Jaehee Park @ 2022-04-21 19:20 UTC (permalink / raw)
To: Larry.Finger
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013,
Alison Schofield
Author comments "Added by Albert" and "Added by Annie" are sprinkled
through the file. These comments are not useful and can be removed.
Suggested-by: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 2cfd8e8d74a4..5adef9b9108d 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -909,7 +909,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
memset((u8 *)&psta->dot11txpn, 0, sizeof(union pn48));
memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48));
}
- /* Commented by Albert 2012/07/21 */
/* When doing the WPS, the wps_ie_len won't equal to 0 */
/* And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted. */
if (padapter->securitypriv.wps_ie_len != 0) {
@@ -1628,9 +1627,6 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
return ielength;
}
-/* */
-/* Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.) */
-/* Added by Annie, 2006-05-07. */
/* */
/* Search by BSSID, */
/* Return Value: */
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v4 4/7] staging: r8188eu: place constants on the right side of tests
2022-04-21 19:20 [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch Jaehee Park
` (2 preceding siblings ...)
2022-04-21 19:20 ` [PATCH v4 3/7] staging: r8188eu: remove 'added by' author comments Jaehee Park
@ 2022-04-21 19:20 ` Jaehee Park
2022-04-21 19:20 ` [PATCH v4 5/7] staging: r8188eu: replace spaces with tabs Jaehee Park
` (2 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Jaehee Park @ 2022-04-21 19:20 UTC (permalink / raw)
To: Larry.Finger
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013
To comply with the linux coding style, place constants on the right
side of the test in comparisons. Issue found with checkpatch.
WARNING: Comparisons should place the constant on the right side of
the test.
Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 5adef9b9108d..b943fb190e4c 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -721,7 +721,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
pmlmepriv->to_join = false;
s_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);
- if (_SUCCESS == s_ret) {
+ if (s_ret == _SUCCESS) {
_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
} else if (s_ret == 2) { /* there is no need to wait for join */
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
@@ -729,7 +729,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
} else {
if (rtw_to_roaming(adapter) != 0) {
if (--pmlmepriv->to_roaming == 0 ||
- _SUCCESS != rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) {
+ rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid,
+ 1, NULL, 0) != _SUCCESS) {
rtw_set_roaming(adapter, 0);
rtw_free_assoc_resources(adapter, 1);
rtw_indicate_disconnect(adapter);
@@ -1970,7 +1971,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
issued = (phtpriv->agg_enable_bitmap >> priority) & 0x1;
issued |= (phtpriv->candidate_tid_bitmap >> priority) & 0x1;
- if (0 == issued) {
+ if (issued == 0) {
psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority);
rtw_addbareq_cmd(padapter, (u8)priority, pattrib->ra);
}
@@ -1997,19 +1998,19 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
else
pnetwork = &pmlmepriv->cur_network;
- if (0 < rtw_to_roaming(padapter)) {
+ if (rtw_to_roaming(padapter) > 0) {
memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(struct ndis_802_11_ssid));
pmlmepriv->assoc_by_bssid = false;
while (1) {
do_join_r = rtw_do_join(padapter);
- if (_SUCCESS == do_join_r) {
+ if (do_join_r == _SUCCESS) {
break;
} else {
pmlmepriv->to_roaming--;
- if (0 < pmlmepriv->to_roaming) {
+ if (pmlmepriv->to_roaming > 0) {
continue;
} else {
rtw_indicate_disconnect(padapter);
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v4 5/7] staging: r8188eu: replace spaces with tabs
2022-04-21 19:20 [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch Jaehee Park
` (3 preceding siblings ...)
2022-04-21 19:20 ` [PATCH v4 4/7] staging: r8188eu: place constants on the right side of tests Jaehee Park
@ 2022-04-21 19:20 ` Jaehee Park
2022-04-21 19:20 ` [PATCH v4 6/7] staging: r8188eu: correct typo in comments Jaehee Park
2022-04-21 19:20 ` [PATCH v4 7/7] staging: r8188eu: remove unused else condition Jaehee Park
6 siblings, 0 replies; 12+ messages in thread
From: Jaehee Park @ 2022-04-21 19:20 UTC (permalink / raw)
To: Larry.Finger
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013
Use tabs instead of spaces. Issue found with checkpatch.
WARNING: suspect code indent for conditional statements
Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index b943fb190e4c..7a90fe826d1d 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -722,7 +722,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
pmlmepriv->to_join = false;
s_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);
if (s_ret == _SUCCESS) {
- _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
+ _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
} else if (s_ret == 2) { /* there is no need to wait for join */
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
rtw_indicate_connect(adapter);
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v4 6/7] staging: r8188eu: correct typo in comments
2022-04-21 19:20 [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch Jaehee Park
` (4 preceding siblings ...)
2022-04-21 19:20 ` [PATCH v4 5/7] staging: r8188eu: replace spaces with tabs Jaehee Park
@ 2022-04-21 19:20 ` Jaehee Park
2022-04-21 19:20 ` [PATCH v4 7/7] staging: r8188eu: remove unused else condition Jaehee Park
6 siblings, 0 replies; 12+ messages in thread
From: Jaehee Park @ 2022-04-21 19:20 UTC (permalink / raw)
To: Larry.Finger
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013
Correct misspellings in the comments. Issue found with checkpatch.
Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 7a90fe826d1d..d422ce87ba7c 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -192,7 +192,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *
/*
return the wlan_network with the matching addr
- Shall be calle under atomic context... to avoid possible racing condition...
+ Shall be called under atomic context... to avoid possible racing condition...
*/
struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr)
{
@@ -328,7 +328,7 @@ void rtw_free_network_queue(struct adapter *dev, u8 isfreeall)
/*
return the wlan_network with the matching addr
- Shall be calle under atomic context... to avoid possible racing condition...
+ Shall be called under atomic context... to avoid possible racing condition...
*/
struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
{
@@ -911,7 +911,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48));
}
/* When doing the WPS, the wps_ie_len won't equal to 0 */
- /* And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted. */
+ /* And the Wi-Fi driver shouldn't allow the data packet to be transmitted. */
if (padapter->securitypriv.wps_ie_len != 0) {
psta->ieee8021x_blocked = true;
padapter->securitypriv.wps_ie_len = 0;
@@ -1305,7 +1305,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
}
/*
-* _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss
+* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss
* @adapter: pointer to struct adapter structure
*/
void _rtw_join_timeout_handler (struct adapter *adapter)
@@ -1340,7 +1340,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
}
/*
-* rtw_scan_timeout_handler - Timeout/Faliure handler for CMD SiteSurvey
+* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey
* @adapter: pointer to struct adapter structure
*/
void rtw_scan_timeout_handler (struct adapter *adapter)
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v4 7/7] staging: r8188eu: remove unused else condition
2022-04-21 19:20 [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch Jaehee Park
` (5 preceding siblings ...)
2022-04-21 19:20 ` [PATCH v4 6/7] staging: r8188eu: correct typo in comments Jaehee Park
@ 2022-04-21 19:20 ` Jaehee Park
2022-04-22 14:45 ` Greg KH
6 siblings, 1 reply; 12+ messages in thread
From: Jaehee Park @ 2022-04-21 19:20 UTC (permalink / raw)
To: Larry.Finger
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013,
Pavel Skripkin
s_ret cannot return '2' so this else condition is unused. Remove this
unnecessary else statement.
Suggested-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index d422ce87ba7c..29b8b101180b 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -723,9 +723,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
s_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);
if (s_ret == _SUCCESS) {
_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
- } else if (s_ret == 2) { /* there is no need to wait for join */
- _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
- rtw_indicate_connect(adapter);
} else {
if (rtw_to_roaming(adapter) != 0) {
if (--pmlmepriv->to_roaming == 0 ||
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v4 1/7] staging: r8188eu: remove unnecessary braces in single statement block
2022-04-21 19:20 ` [PATCH v4 1/7] staging: r8188eu: remove unnecessary braces in single statement block Jaehee Park
@ 2022-04-21 19:52 ` Fabio M. De Francesco
2022-04-21 23:20 ` Fabio M. De Francesco
0 siblings, 1 reply; 12+ messages in thread
From: Fabio M. De Francesco @ 2022-04-21 19:52 UTC (permalink / raw)
To: Larry.Finger, Jaehee Park
Cc: phil, gregkh, linux-staging, linux-kernel, outreachy, jhpark1013
On giovedì 21 aprile 2022 21:20:26 CEST Jaehee Park wrote:
> Remove braces for single statement block to minimize the number of
> empty lines, without loss of readability. Issue found with checkpatch.
> WARNING: braces {} are not necessary for single statement blocks
>
> Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
> ---
> drivers/staging/r8188eu/core/rtw_mlme.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/
r8188eu/core/rtw_mlme.c
> index 3e9882f89f76..d3f4d7cdfa08 100644
> --- a/drivers/staging/r8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/r8188eu/core/rtw_mlme.c
> @@ -112,9 +112,8 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
>
> rtw_free_mlme_priv_ie_data(pmlmepriv);
>
> - if (pmlmepriv) {
> + if (pmlmepriv)
> vfree(pmlmepriv->free_bss_buf);
> - }
>
> }
>
> --
> 2.25.1
>
Hi Jaehee,
If you just want to remove the braces, your patch is good.
But... Did you ask yourself why this code needs to test if "pmlmepriv" is
valid before calling vfree() on it? Actually, the code doesn't need this
test, it just needs to call "vfree(pmlmepriv)" unconditionally.
OK, I know that this is not directly related to your patch or any other
that is explicitly made just for removing unnecessary braces...
vfree() behaves as a no-op function on NULL pointers, therefore there is no
need to test whether or not "pmlmepriv" is valid.
Thanks,
Fabio M. De Francesco
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v4 1/7] staging: r8188eu: remove unnecessary braces in single statement block
2022-04-21 19:52 ` Fabio M. De Francesco
@ 2022-04-21 23:20 ` Fabio M. De Francesco
0 siblings, 0 replies; 12+ messages in thread
From: Fabio M. De Francesco @ 2022-04-21 23:20 UTC (permalink / raw)
To: Jaehee Park
Cc: Larry.Finger, phil, gregkh, linux-staging, linux-kernel,
outreachy, jhpark1013
On giovedì 21 aprile 2022 21:52:14 CEST Fabio M. De Francesco wrote:
> On giovedì 21 aprile 2022 21:20:26 CEST Jaehee Park wrote:
> > Remove braces for single statement block to minimize the number of
> > empty lines, without loss of readability. Issue found with checkpatch.
> > WARNING: braces {} are not necessary for single statement blocks
> >
> > Signed-off-by: Jaehee Park <jhpark1013@gmail.com>
> > ---
> > drivers/staging/r8188eu/core/rtw_mlme.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/
> r8188eu/core/rtw_mlme.c
> > index 3e9882f89f76..d3f4d7cdfa08 100644
> > --- a/drivers/staging/r8188eu/core/rtw_mlme.c
> > +++ b/drivers/staging/r8188eu/core/rtw_mlme.c
> > @@ -112,9 +112,8 @@ void _rtw_free_mlme_priv(struct mlme_priv
*pmlmepriv)
> >
> > rtw_free_mlme_priv_ie_data(pmlmepriv);
> >
> > - if (pmlmepriv) {
> > + if (pmlmepriv)
> > vfree(pmlmepriv->free_bss_buf);
> > - }
> >
> > }
> >
> > --
> > 2.25.1
> >
>
> Hi Jaehee,
>
> If you just want to remove the braces, your patch is good.
>
> But... Did you ask yourself why this code needs to test if "pmlmepriv" is
> valid before calling vfree() on it? Actually, the code doesn't need this
> test, it just needs to call "vfree(pmlmepriv)" unconditionally.
When copy-pasting I overlooked a couple of things... However the argument
is the same: the code doesn't need that 'if' statement before vfree().
I wanted to write "[] it just needs to call "vfree(pmlmepriv-
>free_bss_buf)" unconditionally".
I apologize for not reading twice before sending my email too soon after
writing and moving sentences around.
> OK, I know that this is not directly related to your patch or any other
> that is explicitly made just for removing unnecessary braces...
"pmlmepriv" is valid because we know it from the previous call to
rtw_free_mlme_priv_ie_data(). Therefore the code can dereference
"pmlmepriv".
Furthermore, even if "free_bss_buf" were NULL it wouldn't matter because
"vfree(pmlmepriv->free_bss_buf)" would be a no-op.
Sorry if this inaccurate wording might have confused you about what I was
trying to say.
Thanks,
Fabio
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v4 7/7] staging: r8188eu: remove unused else condition
2022-04-21 19:20 ` [PATCH v4 7/7] staging: r8188eu: remove unused else condition Jaehee Park
@ 2022-04-22 14:45 ` Greg KH
2022-04-27 15:37 ` Jaehee
0 siblings, 1 reply; 12+ messages in thread
From: Greg KH @ 2022-04-22 14:45 UTC (permalink / raw)
To: Jaehee Park
Cc: Larry.Finger, phil, linux-staging, linux-kernel, outreachy,
Pavel Skripkin
On Thu, Apr 21, 2022 at 03:20:32PM -0400, Jaehee Park wrote:
> s_ret cannot return '2' so this else condition is unused. Remove this
> unnecessary else statement.
s_ret is not a function, it is a value.
rtw_select_and_join_from_scanned_queue() is the function here.
Can you fix up the wording in this changelog text and resubmit?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v4 7/7] staging: r8188eu: remove unused else condition
2022-04-22 14:45 ` Greg KH
@ 2022-04-27 15:37 ` Jaehee
0 siblings, 0 replies; 12+ messages in thread
From: Jaehee @ 2022-04-27 15:37 UTC (permalink / raw)
To: Greg KH
Cc: Larry Finger, Phillip Potter, linux-staging, linux-kernel,
Outreachy Linux Kernel, Pavel Skripkin
On Fri, Apr 22, 2022 at 10:45 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Thu, Apr 21, 2022 at 03:20:32PM -0400, Jaehee Park wrote:
> > s_ret cannot return '2' so this else condition is unused. Remove this
> > unnecessary else statement.
>
> s_ret is not a function, it is a value.
> rtw_select_and_join_from_scanned_queue() is the function here.
>
> Can you fix up the wording in this changelog text and resubmit?
>
> thanks,
>
> greg k-h
Sorry about the delay! I've sent the revised patch just now.
Thanks,
Jaehee
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-04-27 15:37 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-21 19:20 [PATCH v4 0/7] staging: r8188eu: fix warnings reported by checkpatch Jaehee Park
2022-04-21 19:20 ` [PATCH v4 1/7] staging: r8188eu: remove unnecessary braces in single statement block Jaehee Park
2022-04-21 19:52 ` Fabio M. De Francesco
2022-04-21 23:20 ` Fabio M. De Francesco
2022-04-21 19:20 ` [PATCH v4 2/7] staging: r8188eu: remove spaces before tabs Jaehee Park
2022-04-21 19:20 ` [PATCH v4 3/7] staging: r8188eu: remove 'added by' author comments Jaehee Park
2022-04-21 19:20 ` [PATCH v4 4/7] staging: r8188eu: place constants on the right side of tests Jaehee Park
2022-04-21 19:20 ` [PATCH v4 5/7] staging: r8188eu: replace spaces with tabs Jaehee Park
2022-04-21 19:20 ` [PATCH v4 6/7] staging: r8188eu: correct typo in comments Jaehee Park
2022-04-21 19:20 ` [PATCH v4 7/7] staging: r8188eu: remove unused else condition Jaehee Park
2022-04-22 14:45 ` Greg KH
2022-04-27 15:37 ` Jaehee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).