* [PATCH V2] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
@ 2022-03-28 8:43 Haowen Bai
2022-03-28 8:47 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Haowen Bai @ 2022-03-28 8:43 UTC (permalink / raw)
To: Larry.Finger, phil, gregkh, straube.linux, martin
Cc: linux-staging, linux-kernel, Haowen Bai
fixes coccinelle warning:
./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "res".
Return "_SUCCESS" on line 380
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
V1->V2: split into two patches.
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 931e6f2..4b7b0ee 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -354,7 +354,6 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
int init_mlme_ext_priv(struct adapter *padapter)
{
- int res = _SUCCESS;
struct registry_priv *pregistrypriv = &padapter->registrypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -377,7 +376,7 @@ int init_mlme_ext_priv(struct adapter *padapter)
pmlmeext->active_keep_alive_check = true;
- return res;
+ return _SUCCESS;
}
void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH V2] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-28 8:43 [PATCH V2] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable Haowen Bai
@ 2022-03-28 8:47 ` Greg KH
2022-03-28 9:07 ` 答复: " 白浩文
0 siblings, 1 reply; 12+ messages in thread
From: Greg KH @ 2022-03-28 8:47 UTC (permalink / raw)
To: Haowen Bai
Cc: Larry.Finger, phil, straube.linux, martin, linux-staging,
linux-kernel
On Mon, Mar 28, 2022 at 04:43:48PM +0800, Haowen Bai wrote:
> fixes coccinelle warning:
> ./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "res".
> Return "_SUCCESS" on line 380
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
> V1->V2: split into two patches.
>
> drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
> index 931e6f2..4b7b0ee 100644
> --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
> +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
> @@ -354,7 +354,6 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
>
> int init_mlme_ext_priv(struct adapter *padapter)
> {
> - int res = _SUCCESS;
> struct registry_priv *pregistrypriv = &padapter->registrypriv;
> struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
> struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
> @@ -377,7 +376,7 @@ int init_mlme_ext_priv(struct adapter *padapter)
>
> pmlmeext->active_keep_alive_check = true;
>
> - return res;
> + return _SUCCESS;
If a function can only ever succeed, why return anything? Please make
this a function return void.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread* 答复: [PATCH V2] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-28 8:47 ` Greg KH
@ 2022-03-28 9:07 ` 白浩文
2022-03-28 9:12 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: 白浩文 @ 2022-03-28 9:07 UTC (permalink / raw)
To: Greg KH
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
straube.linux@gmail.com, martin@kaiser.cx,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Hi, Greg KH
Yes, I think sync rtl8723bs and r8188eu will be better as they have same problem.
commit 067756acdac8e0dd91edf4800e844fcb6e0cc72a
Author: Hariprasad Kelam <hariprasad.kelam@gmail.com>
Date: Mon Jul 15 23:16:18 2019 +0530
staging: rtl8723bs: core: Change return type of init_mlme_ext_priv
As init_mlme_ext_priv function always returns SUCCESS , We can change
return type from int to void.
Fixes below issue identified by coccicheck
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:464:5-8: Unneeded
variable: "res". Return "_SUCCESS" on line 492
________________________________________
发件人: Greg KH <gregkh@linuxfoundation.org>
发送时间: 2022年3月28日 16:47:45
收件人: 白浩文
抄送: Larry.Finger@lwfinger.net; phil@philpotter.co.uk; straube.linux@gmail.com; martin@kaiser.cx; linux-staging@lists.linux.dev; linux-kernel@vger.kernel.org
主题: Re: [PATCH V2] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
On Mon, Mar 28, 2022 at 04:43:48PM +0800, Haowen Bai wrote:
> fixes coccinelle warning:
> ./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "res".
> Return "_SUCCESS" on line 380
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
> V1->V2: split into two patches.
>
> drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
> index 931e6f2..4b7b0ee 100644
> --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
> +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
> @@ -354,7 +354,6 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
>
> int init_mlme_ext_priv(struct adapter *padapter)
> {
> - int res = _SUCCESS;
> struct registry_priv *pregistrypriv = &padapter->registrypriv;
> struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
> struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
> @@ -377,7 +376,7 @@ int init_mlme_ext_priv(struct adapter *padapter)
>
> pmlmeext->active_keep_alive_check = true;
>
> - return res;
> + return _SUCCESS;
If a function can only ever succeed, why return anything? Please make
this a function return void.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: 答复: [PATCH V2] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-28 9:07 ` 答复: " 白浩文
@ 2022-03-28 9:12 ` Greg KH
2022-03-29 9:59 ` baihaowen
0 siblings, 1 reply; 12+ messages in thread
From: Greg KH @ 2022-03-28 9:12 UTC (permalink / raw)
To: 白浩文
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
straube.linux@gmail.com, martin@kaiser.cx,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
A: http://en.wikipedia.org/wiki/Top_post
Q: Were do I find info about this thing called top-posting?
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?
A: No.
Q: Should I include quotations after my reply?
http://daringfireball.net/2007/07/on_top
On Mon, Mar 28, 2022 at 09:07:44AM +0000, 白浩文 wrote:
> Hi, Greg KH
>
> Yes, I think sync rtl8723bs and r8188eu will be better as they have same problem.
>
> commit 067756acdac8e0dd91edf4800e844fcb6e0cc72a
> Author: Hariprasad Kelam <hariprasad.kelam@gmail.com>
> Date: Mon Jul 15 23:16:18 2019 +0530
>
> staging: rtl8723bs: core: Change return type of init_mlme_ext_priv
>
> As init_mlme_ext_priv function always returns SUCCESS , We can change
> return type from int to void.
>
> Fixes below issue identified by coccicheck
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:464:5-8: Unneeded
> variable: "res". Return "_SUCCESS" on line 492
Yes, that would be good.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: 答复: [PATCH V2] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-28 9:12 ` Greg KH
@ 2022-03-29 9:59 ` baihaowen
2022-03-29 11:06 ` [PATCH] " Haowen Bai
0 siblings, 1 reply; 12+ messages in thread
From: baihaowen @ 2022-03-29 9:59 UTC (permalink / raw)
To: Greg KH
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
straube.linux@gmail.com, martin@kaiser.cx,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
在 3/28/22 5:12 PM, Greg KH 写道:
> A: http://en.wikipedia.org/wiki/Top_post
> Q: Were do I find info about this thing called top-posting?
> A: Because it messes up the order in which people normally read text.
> Q: Why is top-posting such a bad thing?
> A: Top-posting.
> Q: What is the most annoying thing in e-mail?
>
> A: No.
> Q: Should I include quotations after my reply?
>
> http://daringfireball.net/2007/07/on_top
>
> On Mon, Mar 28, 2022 at 09:07:44AM +0000, 白浩文 wrote:
>> Hi, Greg KH
>>
>> Yes, I think sync rtl8723bs and r8188eu will be better as they have same problem.
>>
>> commit 067756acdac8e0dd91edf4800e844fcb6e0cc72a
>> Author: Hariprasad Kelam <hariprasad.kelam@gmail.com>
>> Date: Mon Jul 15 23:16:18 2019 +0530
>>
>> staging: rtl8723bs: core: Change return type of init_mlme_ext_priv
>>
>> As init_mlme_ext_priv function always returns SUCCESS , We can change
>> return type from int to void.
>>
>> Fixes below issue identified by coccicheck
>> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:464:5-8: Unneeded
>> variable: "res". Return "_SUCCESS" on line 492
> Yes, that would be good.
>
ok, got and learned a lot as a newbie, thx.
--
Haowen Bai
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-29 9:59 ` baihaowen
@ 2022-03-29 11:06 ` Haowen Bai
2022-03-29 11:09 ` [PATCH V3] " Haowen Bai
2022-03-29 11:26 ` [PATCH] " Dan Carpenter
0 siblings, 2 replies; 12+ messages in thread
From: Haowen Bai @ 2022-03-29 11:06 UTC (permalink / raw)
To: Larry Finger, Phillip Potter, Greg Kroah-Hartman
Cc: Haowen Bai, linux-staging, linux-kernel
As init_mlme_ext_priv function always returns SUCCESS , We can change
return type from int to void.
fixes coccinelle warning:
./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "res".
Return "_SUCCESS" on line 380
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 5 +----
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +-
drivers/staging/r8188eu/os_dep/os_intfs.c | 8 +-------
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 10d5f12..ff48293 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -352,9 +352,8 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
return chanset_size;
}
-int init_mlme_ext_priv(struct adapter *padapter)
+void init_mlme_ext_priv(struct adapter *padapter)
{
- int res = _SUCCESS;
struct registry_priv *pregistrypriv = &padapter->registrypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -376,8 +375,6 @@ int init_mlme_ext_priv(struct adapter *padapter)
pmlmeext->mlmeext_init = true;
pmlmeext->active_keep_alive_check = true;
-
- return res;
}
void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 0c555ea..827ac6c 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -419,7 +419,7 @@ struct mlme_ext_priv {
u8 active_keep_alive_check;
};
-int init_mlme_ext_priv(struct adapter *adapter);
+void init_mlme_ext_priv(struct adapter *adapter);
int init_hw_mlme_ext(struct adapter *padapter);
void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext);
extern void init_mlme_ext_timer(struct adapter *padapter);
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 550721e..ca1c4df 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -490,10 +490,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
init_wifidirect_info(padapter, P2P_ROLE_DISABLE);
reset_global_wifidirect_info(padapter);
- if (init_mlme_ext_priv(padapter) == _FAIL) {
- dev_err(dvobj_to_dev(padapter->dvobj), "init_mlme_ext_priv failed\n");
- goto free_mlme_priv;
- }
+ init_mlme_ext_priv(padapter);
if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) {
dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_xmit_priv failed\n");
@@ -534,9 +531,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
free_mlme_ext:
free_mlme_ext_priv(&padapter->mlmeextpriv);
-free_mlme_priv:
- rtw_free_mlme_priv(&padapter->mlmepriv);
-
free_evt_priv:
rtw_free_evt_priv(&padapter->evtpriv);
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V3] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-29 11:06 ` [PATCH] " Haowen Bai
@ 2022-03-29 11:09 ` Haowen Bai
2022-03-29 11:28 ` Dan Carpenter
2022-03-29 11:26 ` [PATCH] " Dan Carpenter
1 sibling, 1 reply; 12+ messages in thread
From: Haowen Bai @ 2022-03-29 11:09 UTC (permalink / raw)
To: Larry Finger, Phillip Potter, Greg Kroah-Hartman
Cc: Haowen Bai, linux-staging, linux-kernel
As init_mlme_ext_priv function always returns SUCCESS , We can change
return type from int to void.
fixes coccinelle warning:
./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "res".
Return "_SUCCESS" on line 380
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
V1->V2: split into two patches.
V2->V3: change return type from int to void.
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 5 +----
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +-
drivers/staging/r8188eu/os_dep/os_intfs.c | 8 +-------
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 10d5f12..ff48293 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -352,9 +352,8 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
return chanset_size;
}
-int init_mlme_ext_priv(struct adapter *padapter)
+void init_mlme_ext_priv(struct adapter *padapter)
{
- int res = _SUCCESS;
struct registry_priv *pregistrypriv = &padapter->registrypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -376,8 +375,6 @@ int init_mlme_ext_priv(struct adapter *padapter)
pmlmeext->mlmeext_init = true;
pmlmeext->active_keep_alive_check = true;
-
- return res;
}
void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 0c555ea..827ac6c 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -419,7 +419,7 @@ struct mlme_ext_priv {
u8 active_keep_alive_check;
};
-int init_mlme_ext_priv(struct adapter *adapter);
+void init_mlme_ext_priv(struct adapter *adapter);
int init_hw_mlme_ext(struct adapter *padapter);
void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext);
extern void init_mlme_ext_timer(struct adapter *padapter);
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 550721e..ca1c4df 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -490,10 +490,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
init_wifidirect_info(padapter, P2P_ROLE_DISABLE);
reset_global_wifidirect_info(padapter);
- if (init_mlme_ext_priv(padapter) == _FAIL) {
- dev_err(dvobj_to_dev(padapter->dvobj), "init_mlme_ext_priv failed\n");
- goto free_mlme_priv;
- }
+ init_mlme_ext_priv(padapter);
if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) {
dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_xmit_priv failed\n");
@@ -534,9 +531,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
free_mlme_ext:
free_mlme_ext_priv(&padapter->mlmeextpriv);
-free_mlme_priv:
- rtw_free_mlme_priv(&padapter->mlmepriv);
-
free_evt_priv:
rtw_free_evt_priv(&padapter->evtpriv);
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH V3] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-29 11:09 ` [PATCH V3] " Haowen Bai
@ 2022-03-29 11:28 ` Dan Carpenter
2022-03-30 1:14 ` baihaowen
0 siblings, 1 reply; 12+ messages in thread
From: Dan Carpenter @ 2022-03-29 11:28 UTC (permalink / raw)
To: Haowen Bai
Cc: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
On Tue, Mar 29, 2022 at 07:09:17PM +0800, Haowen Bai wrote:
> @@ -534,9 +531,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
> free_mlme_ext:
> free_mlme_ext_priv(&padapter->mlmeextpriv);
>
> -free_mlme_priv:
> - rtw_free_mlme_priv(&padapter->mlmepriv);
Nope. We still need to free this on the error path. Just delete the
unused label but don't delete the free function.
> -
> free_evt_priv:
> rtw_free_evt_priv(&padapter->evtpriv);
regards,
dan carpenter
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V3] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-29 11:28 ` Dan Carpenter
@ 2022-03-30 1:14 ` baihaowen
2022-03-30 1:28 ` [PATCH V4] " Haowen Bai
0 siblings, 1 reply; 12+ messages in thread
From: baihaowen @ 2022-03-30 1:14 UTC (permalink / raw)
To: Dan Carpenter
Cc: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
在 3/29/22 7:28 PM, Dan Carpenter 写道:
> On Tue, Mar 29, 2022 at 07:09:17PM +0800, Haowen Bai wrote:
>> @@ -534,9 +531,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
>> free_mlme_ext:
>> free_mlme_ext_priv(&padapter->mlmeextpriv);
>>
>> -free_mlme_priv:
>> - rtw_free_mlme_priv(&padapter->mlmepriv);
> Nope. We still need to free this on the error path. Just delete the
> unused label but don't delete the free function.
>
>> -
>> free_evt_priv:
>> rtw_free_evt_priv(&padapter->evtpriv);
> regards,
> dan carpenter
yes, you are right. It will lead to memory leak.
--
Haowen Bai
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V4] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-30 1:14 ` baihaowen
@ 2022-03-30 1:28 ` Haowen Bai
2022-03-30 7:20 ` Dan Carpenter
0 siblings, 1 reply; 12+ messages in thread
From: Haowen Bai @ 2022-03-30 1:28 UTC (permalink / raw)
To: Larry Finger, Phillip Potter, Greg Kroah-Hartman
Cc: Haowen Bai, linux-staging, linux-kernel
As init_mlme_ext_priv function always returns SUCCESS , We can change
return type from int to void.
fixes coccinelle warning:
./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "res".
Return "_SUCCESS" on line 380
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
V1->V2: split into two patches.
V2->V3: change return type from int to void.
V3->V4: just delete the unused label but don't delete the free function.
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 5 +----
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +-
drivers/staging/r8188eu/os_dep/os_intfs.c | 6 +-----
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 10d5f12..ff48293 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -352,9 +352,8 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
return chanset_size;
}
-int init_mlme_ext_priv(struct adapter *padapter)
+void init_mlme_ext_priv(struct adapter *padapter)
{
- int res = _SUCCESS;
struct registry_priv *pregistrypriv = &padapter->registrypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -376,8 +375,6 @@ int init_mlme_ext_priv(struct adapter *padapter)
pmlmeext->mlmeext_init = true;
pmlmeext->active_keep_alive_check = true;
-
- return res;
}
void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 0c555ea..827ac6c 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -419,7 +419,7 @@ struct mlme_ext_priv {
u8 active_keep_alive_check;
};
-int init_mlme_ext_priv(struct adapter *adapter);
+void init_mlme_ext_priv(struct adapter *adapter);
int init_hw_mlme_ext(struct adapter *padapter);
void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext);
extern void init_mlme_ext_timer(struct adapter *padapter);
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 550721e..c531504 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -490,10 +490,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
init_wifidirect_info(padapter, P2P_ROLE_DISABLE);
reset_global_wifidirect_info(padapter);
- if (init_mlme_ext_priv(padapter) == _FAIL) {
- dev_err(dvobj_to_dev(padapter->dvobj), "init_mlme_ext_priv failed\n");
- goto free_mlme_priv;
- }
+ init_mlme_ext_priv(padapter);
if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) {
dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_xmit_priv failed\n");
@@ -534,7 +531,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
free_mlme_ext:
free_mlme_ext_priv(&padapter->mlmeextpriv);
-free_mlme_priv:
rtw_free_mlme_priv(&padapter->mlmepriv);
free_evt_priv:
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH V4] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-30 1:28 ` [PATCH V4] " Haowen Bai
@ 2022-03-30 7:20 ` Dan Carpenter
0 siblings, 0 replies; 12+ messages in thread
From: Dan Carpenter @ 2022-03-30 7:20 UTC (permalink / raw)
To: Haowen Bai
Cc: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
On Wed, Mar 30, 2022 at 09:28:59AM +0800, Haowen Bai wrote:
> As init_mlme_ext_priv function always returns SUCCESS , We can change
> return type from int to void.
>
> fixes coccinelle warning:
> ./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "res".
> Return "_SUCCESS" on line 380
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
> V1->V2: split into two patches.
> V2->V3: change return type from int to void.
> V3->V4: just delete the unused label but don't delete the free function.
Looks okay now. Thanks!
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
regards,
dan carpenter
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable
2022-03-29 11:06 ` [PATCH] " Haowen Bai
2022-03-29 11:09 ` [PATCH V3] " Haowen Bai
@ 2022-03-29 11:26 ` Dan Carpenter
1 sibling, 0 replies; 12+ messages in thread
From: Dan Carpenter @ 2022-03-29 11:26 UTC (permalink / raw)
To: Haowen Bai
Cc: Larry Finger, Phillip Potter, Greg Kroah-Hartman, linux-staging,
linux-kernel
On Tue, Mar 29, 2022 at 07:06:06PM +0800, Haowen Bai wrote:
> @@ -534,9 +531,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
> free_mlme_ext:
> free_mlme_ext_priv(&padapter->mlmeextpriv);
>
> -free_mlme_priv:
> - rtw_free_mlme_priv(&padapter->mlmepriv);
No, we still need to free this on error.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-03-30 7:21 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-28 8:43 [PATCH V2] staging: r8188eu: Directly return _SUCCESS instead of using local ret variable Haowen Bai
2022-03-28 8:47 ` Greg KH
2022-03-28 9:07 ` 答复: " 白浩文
2022-03-28 9:12 ` Greg KH
2022-03-29 9:59 ` baihaowen
2022-03-29 11:06 ` [PATCH] " Haowen Bai
2022-03-29 11:09 ` [PATCH V3] " Haowen Bai
2022-03-29 11:28 ` Dan Carpenter
2022-03-30 1:14 ` baihaowen
2022-03-30 1:28 ` [PATCH V4] " Haowen Bai
2022-03-30 7:20 ` Dan Carpenter
2022-03-29 11:26 ` [PATCH] " Dan Carpenter
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).