staging: rtl8723bs: remove shadowed variable in sdio_halinit
PATCH v2 1/1 staging: rtl8723bs: remove shadowed variable in sdio_halinit
The variable 'bMacPwrCtrlOn' was redeclared in the function CardEnable, shadowing a variable of the same name declared at the top of the function (line 21).
Remove the redundant 'u8' type declaration to use the existing outer variable and resolve a -Wshadow warning.
---
Changes in v2:
Removed incorrect blank line after the opening brace that was left behind when removing the Adapter variable.
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 1 - drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +0 -1
@@ -208,7 +208,6 @@ void ODM_TxPwrTrackSetPwr_8723B( }if (Method ==TXAGC ) { - pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = pDM_Odm->Absolute_OFDMSwingIdx[RFPath]; pDM_Odm->Modify_TxAGC_Flag_PathA = true;
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -1
@@ -30,7 +30,7 @@ static u8 CardEnable(struct adapter *padapter) ret =HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_enable_flow);if (ret == _SUCCESS) { -u8 bMacPwrCtrlOn = true; + bMacPwrCtrlOn = true;rtw_hal_set_hwreg (padapter,HW_VAR_APFM_ON_MAC , &bMacPwrCtrlOn); } }else
Signature · 1 line
2.53.0
Quoted 22 lines · Haroen Tmimi
The variable 'bMacPwrCtrlOn' was redeclared in the function CardEnable, shadowing a variable of the same name declared at the top of the function (line 21).
Remove the redundant 'u8' type declaration to use the existing outer variable and resolve a -Wshadow warning.
Signed-off-by Haroen Tmimi <[email protected]>---
Changes in v2:
Removed incorrect blank line after the opening brace that was left behind when removing the Adapter variable.drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 1 - drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +0
-0
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c void ODM_TxPwrTrackSetPwr_8723B( · line 213
Quoted 7 lines
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +0
-1@@ -208,7 +208,6 @@ void ODM_TxPwrTrackSetPwr_8723B( }if (Method ==TXAGC ) { - pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = pDM_Odm->Absolute_OFDMSwingIdx[RFPath]; pDM_Odm->Modify_TxAGC_Flag_PathA = true;
It looks like you accidently left your previous diff in this patch.
Thanks,
ET