2021-05-26 11:25:22

by Bixuan Cui

Subject: [PATCH next] staging: rtl8723bs: HalBtc8723b1Ant.c: Remove unused variables

Fix the build warning: [-Wunused-but-set-variable]

drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c:2710:6: warning: variable ‘u4Tmp’ set but not used
2710 | u32 u4Tmp;
| ^~~~~
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c:2709:13: warning: variable ‘u1Tmpb’ set but not used
2709 | u8 u1Tmpa, u1Tmpb;
| ^~~~~~
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c:2709:5: warning: variable ‘u1Tmpa’ set but not used
2709 | u8 u1Tmpa, u1Tmpb;
| ^~~~~~

Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Bixuan Cui <[email protected]>
---
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
index 518d5354bda4..adfdc4f14b08 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
@@ -2706,9 +2706,6 @@ void EXhalbtc8723b1ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type)
bool bBtCtrlAggBufSize = false;
u8 aggBufSize = 5;

- u8 u1Tmpa, u1Tmpb;
- u32 u4Tmp;
-
if (pBtCoexist->bManualControl || pBtCoexist->bStopCoexDm)
return;

@@ -2716,9 +2713,9 @@ void EXhalbtc8723b1ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type)
pCoexSta->bWiFiIsHighPriTask = true;

halbtc8723b1ant_PsTdma(pBtCoexist, FORCE_EXEC, false, 8); /* Force antenna setup for no scan result issue */
- u4Tmp = pBtCoexist->fBtcRead4Byte(pBtCoexist, 0x948);
- u1Tmpa = pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x765);
- u1Tmpb = pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x67);
+ pBtCoexist->fBtcRead4Byte(pBtCoexist, 0x948);
+ pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x765);
+ pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x67);
} else {
pCoexSta->bWiFiIsHighPriTask = false;

--
2.17.1

2021-05-27 11:04:20

by Greg Kroah-Hartman

Subject: Re: [PATCH next] staging: rtl8723bs: HalBtc8723b1Ant.c: Remove unused variables

On Wed, May 26, 2021 at 03:45:37PM +0800, Bixuan Cui wrote:
> Fix the build warning: [-Wunused-but-set-variable]
>
> drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c:2710:6: warning: variable ‘u4Tmp’ set but not used
> 2710 | u32 u4Tmp;
> | ^~~~~
> drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c:2709:13: warning: variable ‘u1Tmpb’ set but not used
> 2709 | u8 u1Tmpa, u1Tmpb;
> | ^~~~~~
> drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c:2709:5: warning: variable ‘u1Tmpa’ set but not used
> 2709 | u8 u1Tmpa, u1Tmpb;
> | ^~~~~~
>
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Bixuan Cui <[email protected]>
> ---
> drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
> index 518d5354bda4..adfdc4f14b08 100644
> --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
> +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
> @@ -2706,9 +2706,6 @@ void EXhalbtc8723b1ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type)
> bool bBtCtrlAggBufSize = false;
> u8 aggBufSize = 5;
>
> - u8 u1Tmpa, u1Tmpb;
> - u32 u4Tmp;
> -
> if (pBtCoexist->bManualControl || pBtCoexist->bStopCoexDm)
> return;
>
> @@ -2716,9 +2713,9 @@ void EXhalbtc8723b1ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type)
> pCoexSta->bWiFiIsHighPriTask = true;
>
> halbtc8723b1ant_PsTdma(pBtCoexist, FORCE_EXEC, false, 8); /* Force antenna setup for no scan result issue */
> - u4Tmp = pBtCoexist->fBtcRead4Byte(pBtCoexist, 0x948);
> - u1Tmpa = pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x765);
> - u1Tmpb = pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x67);
> + pBtCoexist->fBtcRead4Byte(pBtCoexist, 0x948);
> + pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x765);
> + pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x67);
> } else {
> pCoexSta->bWiFiIsHighPriTask = false;
>
> --
> 2.17.1
>
>

Does not apply to my tree :(

2021-05-28 05:11:33

by Bixuan Cui

Subject: Re: [PATCH next] staging: rtl8723bs: HalBtc8723b1Ant.c: Remove unused variables

On 2021/5/27 19:01, Greg KH wrote:
>> halbtc8723b1ant_PsTdma(pBtCoexist, FORCE_EXEC, false, 8); /* Force antenna setup for no scan result issue */
>> - u4Tmp = pBtCoexist->fBtcRead4Byte(pBtCoexist, 0x948);
>> - u1Tmpa = pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x765);
>> - u1Tmpb = pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x67);
>> + pBtCoexist->fBtcRead4Byte(pBtCoexist, 0x948);
>> + pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x765);
>> + pBtCoexist->fBtcRead1Byte(pBtCoexist, 0x67);
>> } else {
>> pCoexSta->bWiFiIsHighPriTask = false;
>>
>> --
>> 2.17.1
>>
>>
> Does not apply to my tree :(
Hi,
This warning has been fixed by commit db52e8f48067. Please ignore my patch.

Thanks
Bixuan Cui


> .