staging: rtl8723bs: fix compiler 'W=1' warnings
cover staging: rtl8723bs: fix compiler 'W=1' warnings
This patchset fixes some compiler warnings related to unused variables:
1. Removes unused variable after applying of
https://lore.kernel.org/linux-staging/99b111d2bac822b9dc7ff6e1cfd3d3efc62ef836.1618064275.git.fabioaiuto83@gmail.com/
and the issue was reported by kernel test robot:
https://lore.kernel.org/linux-staging/[email protected]/
2. Fixes two long lines checkpatch issues
3. Removes unused variable
Fabio Aiuto (3):
staging: rtl8723bs: remove unused variable ret in hal/sdio_halinit.c staging rtl8723bs: split long lines
staging: rtl8723bs: remove unused variable 'start' in
hal/sdio_halinit.c
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/3 staging: rtl8723bs: remove unused variable ret in hal/sdio_halinit.c
fix following compiler warning issue:
drivers/staging/rtl8723bs/hal/sdio_halinit.c:
In function 'CardDisableRTL8723BSdio':
Quoted 1 line
Quoted 1 line
drivers/staging/rtl8723bs/hal/sdio_halinit.c:881:5:
warning: variable 'ret' set but not used [-Wunused-but-set-variable]
881 | u8 ret = _FAIL;
| ^~~--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +2 -4
@@ -878,10 +878,9 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter) {u8 u1bTmp;u8 bMacPwrCtrlOn; -u8 ret = _FAIL;/* Run LPS WL RFOFF flow */ - ret =HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow); +HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow);/* ==== Reset digital sequence ====== */
@@ -909,9 +908,8 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)/* ==== Reset digital sequence end ====== */ bMacPwrCtrlOn = false;/* Disable CMD53 R/W */ - ret = false;rtw_hal_set_hwreg (padapter,HW_VAR_APFM_ON_MAC , &bMacPwrCtrlOn); - ret =HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); +HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); }static u32 rtl8723bs_hal_deinit (struct adapter *padapter)
Signature · 1 line
2.20.1
PATCH 2/3 staging rtl8723bs: split long lines
In reply to Fabio Aiutofix following post-commit hook checkpatch issues:
WARNING: line length of 116 exceeds 100 columns
30: FILE: drivers/staging/rtl8723bs/hal/sdio_halinit.c:883:
+ HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK,PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_enter_lps_flow);
WARNING: line length of 119 exceeds 100 columns
41: FILE: drivers/staging/rtl8723bs/hal/sdio_halinit.c:912:
+ HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK,PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_card_disable_flow);
--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +4 -2
@@ -880,7 +880,8 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)u8 bMacPwrCtrlOn;/* Run LPS WL RFOFF flow */ -HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow); +HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK , +PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow);/* ==== Reset digital sequence ====== */
@@ -909,7 +910,8 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter) bMacPwrCtrlOn = false;/* Disable CMD53 R/W */ rtw_hal_set_hwreg (padapter,HW_VAR_APFM_ON_MAC , &bMacPwrCtrlOn); -HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); +HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK , +PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); }static u32 rtl8723bs_hal_deinit (struct adapter *padapter)
Signature · 1 line
2.20.1
PATCH 3/3 staging: rtl8723bs: remove unused variable 'start' in hal/sdio_halinit.c
In reply to Fabio Aiutofix following W=1 compiler issue:
drivers/staging/rtl8723bs/hal/sdio_halinit.c:
In function '_ReadAdapterInfo8723BS':drivers/staging/rtl8723bs/hal/sdio_halinit.c:1156:16:
warning: variable 'start' set but not used [-Wunused-but-set-variable]
1156 | unsigned long start;
| ^~~~~--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -4
@@ -1153,7 +1153,6 @@ static void _InitOtherVariable(struct adapter *Adapter)static s32 _ReadAdapterInfo8723BS (struct adapter *padapter) {u8 val8; -unsigned long start;/* before access eFuse, make sure card enable has been called */ if (!padapter->hw_init_completed)
@@ -1164,9 +1163,6 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter) val8 |=BIT (6 );rtw_write8 (padapter,0x4e , val8); - - start = jiffies; -_EfuseCellSel (padapter);_ReadRFType (padapter);_ReadPROMContent (padapter);
Signature · 1 line
2.20.1
Greg KH
maintainerRe: [PATCH 1/3] staging: rtl8723bs: remove unused variable ret in hal/sdio_halinit.c
In reply to Fabio AiutoQuoted 32 lines · Fabio Aiuto
fix following compiler warning issue:
drivers/staging/rtl8723bs/hal/sdio_halinit.c:
In function 'CardDisableRTL8723BSdio':Quoted 1 line
Quoted 1 line
drivers/staging/rtl8723bs/hal/sdio_halinit.c:881:5:warning: variable 'ret' set but not used [-Wunused-but-set-variable]
881 | u8 ret = _FAIL; | ^~~Reported-by kernel test robot <[email protected]>Signed-off-by Fabio Aiuto <[email protected]>--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +1
-2@@ -878,10 +878,9 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter) {u8 u1bTmp;u8 bMacPwrCtrlOn; -u8 ret = _FAIL;/* Run LPS WL RFOFF flow */ - ret =HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow); +HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow);/* ==== Reset digital sequence ====== */
drivers/staging/rtl8723bs/hal/sdio_halinit.c static void CardDisableRTL8723BSdio(struct adapter *padapter) · line 913
Quoted 8 lines
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1
-2@@ -909,9 +908,8 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)/* ==== Reset digital sequence end ====== */ bMacPwrCtrlOn = false;/* Disable CMD53 R/W */ - ret = false;rtw_hal_set_hwreg (padapter,HW_VAR_APFM_ON_MAC , &bMacPwrCtrlOn); - ret =HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); +HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); }
Why isn't the return value being checked and returned to the caller if something goes wrong? Ignoring it feels wrong to me.
thanks,
greg k-h
Greg KH
maintainerRe: [PATCH 2/3] staging rtl8723bs: split long lines
In reply to Fabio AiutoQuoted 12 lines · Fabio Aiuto
fix following post-commit hook checkpatch issues:
WARNING: line length of 116 exceeds 100 columns 30: FILE:
drivers/staging/rtl8723bs/hal/sdio_halinit.c:883:(quoted diff) +1
-0+ HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK,
PWR_FAB_ALL_MSK,PWR_INTF_SDIO_MSK,rtl8723B_enter_lps_flow);WARNING: line length of 119 exceeds 100 columns 41: FILE:
drivers/staging/rtl8723bs/hal/sdio_halinit.c:912:(quoted diff) +1
-0+ HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK,
PWR_FAB_ALL_MSK,PWR_INTF_SDIO_MSK,rtl8723B_card_disable_flow);
Quoted 4 lines
Signed-off-by Fabio Aiuto <[email protected]>--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
You forgot a ':' in your subject line :(
Re: [PATCH 1/3] staging: rtl8723bs: remove unused variable ret in hal/sdio_halinit.c
In reply to Greg KHQuoted 45 lines · Greg KH
Quoted 32 lines · Fabio Aiuto
fix following compiler warning issue:
drivers/staging/rtl8723bs/hal/sdio_halinit.c:
In function 'CardDisableRTL8723BSdio':Quoted 1 line
Quoted 1 line
drivers/staging/rtl8723bs/hal/sdio_halinit.c:881:5:warning: variable 'ret' set but not used [-Wunused-but-set-variable]
881 | u8 ret = _FAIL; | ^~~Reported-by kernel test robot <[email protected]>Signed-off-by Fabio Aiuto <[email protected]>--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +1
-2@@ -878,10 +878,9 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter) {u8 u1bTmp;u8 bMacPwrCtrlOn; -u8 ret = _FAIL;/* Run LPS WL RFOFF flow */ - ret =HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow); +HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow);/* ==== Reset digital sequence ====== */ drivers/staging/rtl8723bs/hal/sdio_halinit.c static void CardDisableRTL8723BSdio(struct adapter *padapter) · line 913
Quoted 8 lines
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1
-2@@ -909,9 +908,8 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)/* ==== Reset digital sequence end ====== */ bMacPwrCtrlOn = false;/* Disable CMD53 R/W */ - ret = false;rtw_hal_set_hwreg (padapter,HW_VAR_APFM_ON_MAC , &bMacPwrCtrlOn); - ret =HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); +HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); }Why isn't the return value being checked and returned to the caller if something goes wrong? Ignoring it feels wrong to me.
Quoted 3 lines
thanks,
greg k-h
ok, I will propagate the return value to the whole caller chain. CardDisableRTL8723BSdio returns void, will change this to u8...
thank you,
fabio