staging: rtl8723bs: remove commented out dead code in sdio_halinit.c
PATCH v2 1/3 staging: rtl8723bs: remove commented out dead code in sdio_halinit.c
Remove commented out dead code that have been dead since the driver was introduced to staging. Code can be recovered from git history if needed.
---
v2:
- Rebased on staging-next
- Split into separate patches per feedback
- Removed commented out dead code instead of fixing whitespace
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 24 -------------------- 1 file changed, 24 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -24
@@ -46,8 +46,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)u16 value16;u32 value32;u8 ret; -/* u8 bMacPwrCtrlOn; */ -/* all of these MUST be configured before power on */
@@ -69,10 +67,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter) value16 |= EnPDN;/* Enable HW power down and RF on */ rtw_write16 (padapter,REG_APS_FSMCO , value16); -/* Enable CMD53 R/W Operation */ -/* bMacPwrCtrlOn = true; */ -/* rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); */ -rtw_write8 (padapter,REG_CR ,0x00 );/* Enable MAC DMA/WMAC/SCHEDULE/SEC block */ value16 =rtw_read16 (padapter,REG_CR );
@@ -359,7 +353,6 @@ static void _InitNetworkType(struct adapter *padapter) value32 =rtw_read32 (padapter,REG_CR );/* TODO: use the other function to set network type */ -/* value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AD_HOC); */ value32 = (value32 & ~MASK_NETTYPE ) |_NETTYPE (NT_LINK_AP );rtw_write32 (padapter,REG_CR , value32);
@@ -486,9 +479,6 @@ static void _initSdioAggregationSetting(struct adapter *padapter) {struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -/* Tx aggregation setting */ -/* sdio_AggSettingTxUpdate(padapter); */ -/* Rx aggregation setting */ HalRxAggr8723BSdio (padapter);
@@ -640,9 +630,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)return _SUCCESS; } -/* Disable Interrupt first. */ -/* rtw_hal_disable_interrupt(padapter); */ - ret =_InitPowerOn_8723BS (padapter);if (ret == _FAIL)return _FAIL;
@@ -661,8 +648,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtl8723b_InitializeFirmwareVars (padapter); -/* SIC_Init(padapter); */ -if (pwrctrlpriv->reg_rfoff) pwrctrlpriv->rf_pwrstate = rf_off;
@@ -745,11 +730,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtw_hal_set_chnl_bw (padapter, padapter->registrypriv.channel,CHANNEL_WIDTH_20 ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ); -/* Record original value for template. This is arough data, we can only use the data */ -/* for power adjust. The value can not be adjustde according to different power!!! */ -/* pHalData->OriginalCckTxPwrIdx = pHalData->CurrentCckTxPwrIdx; */ -/* pHalData->OriginalOfdm24GTxPwrIdx = pHalData->CurrentOfdm24GTxPwrIdx; */ -rtl8723b_InitAntenna_Selection (padapter);/* */
@@ -791,8 +771,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* ack for xmit mgmt frames. */ rtw_write32 (padapter,REG_FWHW_TXQ_CTRL ,rtw_read32 (padapter,REG_FWHW_TXQ_CTRL ) |BIT (12 )); -/* pHalData->PreRpwmVal = SdioLocalCmd52Read1Byte(padapter, SDIO_REG_HRPWM1) & 0x80; */ - { pwrctrlpriv->rf_pwrstate = rf_on;
@@ -1080,8 +1058,6 @@ static void _ReadPROMContent(struct adapter *padapter) pEEPROM->EepromOrEfuse = (eeValue &BOOT_FROM_EEPROM ) ? true : false; pEEPROM->bautoload_fail_flag = (eeValue &EEPROM_EN ) ? false : true; -/* pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE; */ -_ReadEfuseInfo8723BS (padapter); }
Signature · 1 line
2.53.0
PATCH v2 2/3 staging: rtl8723bs: fix whitespace issues in sdio_halinit.c
Remove spaces before tabs in comments and fix extra spaces to address checkpatch warnings.
---
v2:
- Rebased on staging-next
- Split from original patch 1/2
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +16 -16
@@ -822,7 +822,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* */ /* Description: */ -/* RTL8723e card disable power sequence v003 which suggested by Scott. */ +/* RTL8723e card disable power sequence v003 which suggested by Scott. */ /* */ /* First created by tynli. 2011.01.28. */ /* */
@@ -834,7 +834,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)/* Run LPS WL RFOFF flow */ HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow); -/* ==== Reset digital sequence ====== */ +/* ==== Reset digital sequence ====== */ val =rtw_read8 (padapter,REG_MCUFWDL );if ((val &RAM_DL_SEL ) && padapter->bFWReady)/* 8051 RAM code */
@@ -857,7 +857,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter) val |=BIT (0 );rtw_write8 (padapter,REG_RSV_CTRL +1 , val); -/* ==== Reset digital sequence end ====== */ +/* ==== Reset digital sequence end ====== */ bMacPwrCtrlOn = false;/* Disable CMD53 R/W */ rtw_hal_set_hwreg (padapter,HW_VAR_APFM_ON_MAC , &bMacPwrCtrlOn);
@@ -959,13 +959,13 @@ void rtl8723bs_interface_configure(struct adapter *padapter) }/* */ -/* Description: */ -/* We should set Efuse cell selection to WiFi cell in default. */ +/* Description: */ +/* We should set Efuse cell selection to WiFi cell in default. */ /* */ -/* Assumption: */ -/* PASSIVE_LEVEL */ +/* Assumption: */ +/* PASSIVE_LEVEL */ /* */ -/* Added by Roger, 2010.11.23. */ +/* Added by Roger, 2010.11.23. */ /* */ static void _EfuseCellSel (struct adapter *padapter) {
@@ -1051,7 +1051,7 @@ static void _ReadEfuseInfo8723BS(struct adapter *padapter)static void _ReadPROMContent (struct adapter *padapter) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter); -u8 eeValue; +u8 eeValue; eeValue =rtw_read8 (padapter,REG_9346CR );/* To check system boot selection. */
@@ -1062,11 +1062,11 @@ static void _ReadPROMContent(struct adapter *padapter) }/* */ -/* Description: */ -/* Read HW adapter information by E-Fuse or EEPROM according CR9346 reported. */ +/* Description: */ +/* Read HW adapter information by E-Fuse or EEPROM according CR9346 reported. */ /* */ -/* Assumption: */ -/* PASSIVE_LEVEL (SDIO interface) */ +/* Assumption: */ +/* PASSIVE_LEVEL (SDIO interface) */ /* */ /* */ static s32 _ReadAdapterInfo8723BS (struct adapter *padapter)
@@ -1179,14 +1179,14 @@ void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf, int l }/* */ -/* Description: */ -/* Query setting of specified variable. */ +/* Description: */ +/* Query setting of specified variable. */ /* */ u8 GetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue ) { -u8 bResult = _SUCCESS; +u8 bResult = _SUCCESS;switch (eVariable) {case HAL_DEF_IS_SUPPORT_ANT_DIV :
Signature · 1 line
2.53.0
Re: [PATCH v2 2/3] staging: rtl8723bs: fix whitespace issues in sdio_halinit.c
Quoted 102 lines · Josh Hesketh
Remove spaces before tabs in comments and fix extra spaces to address checkpatch warnings.
Signed-off-by Josh Hesketh <[email protected]>---
v2:
- Rebased on staging-next
- Split from original patch 1/2drivers/staging/rtl8723bs/hal/sdio_halinit.c| 32 ++++++++++----------1 file changed, 16 insertions(+), 16 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +15
-15@@ -822,7 +822,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* */ /* Description: */ -/* RTL8723e card disable power sequence v003 which suggested by Scott. */ +/* RTL8723e card disable power sequence v003 which suggested by Scott. */ /* */ /* First created by tynli. 2011.01.28. */ /* */ @@ -834,7 +834,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)/* Run LPS WL RFOFF flow */ HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow); -/* ==== Reset digital sequence ====== */ +/* ==== Reset digital sequence ====== */ val =rtw_read8 (padapter,REG_MCUFWDL );if ((val &RAM_DL_SEL ) && padapter->bFWReady)/* 8051 RAM code */ @@ -857,7 +857,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter) val |=BIT (0 );rtw_write8 (padapter,REG_RSV_CTRL +1 , val); -/* ==== Reset digital sequence end ====== */ +/* ==== Reset digital sequence end ====== */ bMacPwrCtrlOn = false;/* Disable CMD53 R/W */ rtw_hal_set_hwreg (padapter,HW_VAR_APFM_ON_MAC , &bMacPwrCtrlOn);@@ -959,13 +959,13 @@ void rtl8723bs_interface_configure(struct adapter *padapter) }/* */ -/* Description: */ -/* We should set Efuse cell selection to WiFi cell in default. */ +/* Description: */ +/* We should set Efuse cell selection to WiFi cell in default. */ /* */ -/* Assumption: */ -/* PASSIVE_LEVEL */ +/* Assumption: */ +/* PASSIVE_LEVEL */ /* */ -/* Added by Roger, 2010.11.23. */ +/* Added by Roger, 2010.11.23. */ /* */ static void _EfuseCellSel (struct adapter *padapter) {@@ -1051,7 +1051,7 @@ static void _ReadEfuseInfo8723BS(struct adapter *padapter)static void _ReadPROMContent (struct adapter *padapter) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter); -u8 eeValue; +u8 eeValue; eeValue =rtw_read8 (padapter,REG_9346CR );/* To check system boot selection. */ @@ -1062,11 +1062,11 @@ static void _ReadPROMContent(struct adapter *padapter) }/* */ -/* Description: */ -/* Read HW adapter information by E-Fuse or EEPROM according CR9346 reported. */ +/* Description: */ +/* Read HW adapter information by E-Fuse or EEPROM according CR9346 reported. */ /* */ -/* Assumption: */ -/* PASSIVE_LEVEL (SDIO interface) */ +/* Assumption: */ +/* PASSIVE_LEVEL (SDIO interface) */ /* */ /* */ static s32 _ReadAdapterInfo8723BS (struct adapter *padapter)@@ -1179,14 +1179,14 @@ void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf, int l }/* */ -/* Description: */ -/* Query setting of specified variable. */ +/* Description: */ +/* Query setting of specified variable. */ /* */ u8 GetHalDefVar8723BSDIO(
struct adapter *Adapter, enumhal_def_variableeVariable, void *pValue
)
{drivers/staging/rtl8723bs/hal/sdio_halinit.c +1
-1-u8 bResult = _SUCCESS; +u8 bResult = _SUCCESS;
Quoted 2 lines
switch (eVariable) {
case HAL_DEF_IS_SUPPORT_ANT_DIV:LGTM.
PATCH v2 3/3 staging: rtl8723bs: remove unnecessary else after return in sdio_halinit.c
In reply to Josh HeskethRemove else branch following a conditional return statement
---
v2:
- Rebased on staging-next
- Split from original patch 1/2
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +3 -3
@@ -641,11 +641,11 @@ u32 rtl8723bs_hal_init(struct adapter *padapter) padapter->bFWReady = false; pHalData->fw_ractrl = false;return ret; - }else { - padapter->bFWReady = true; - pHalData->fw_ractrl = true; } + padapter->bFWReady = true; + pHalData->fw_ractrl = true; +rtl8723b_InitializeFirmwareVars (padapter);if (pwrctrlpriv->reg_rfoff)
Signature · 1 line
2.53.0
Re: [PATCH v2 3/3] staging: rtl8723bs: remove unnecessary else after return in sdio_halinit.c
LGTM.
Quoted 29 lines · Josh Hesketh
Remove else branch following a conditional return statement
Signed-off-by Josh Hesketh <[email protected]>---
v2:
- Rebased on staging-next
- Split from original patch 1/2drivers/staging/rtl8723bs/hal/sdio_halinit.c| 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +3
-3@@ -641,11 +641,11 @@ u32 rtl8723bs_hal_init(struct adapter *padapter) padapter->bFWReady = false; pHalData->fw_ractrl = false;return ret; - }else { - padapter->bFWReady = true; - pHalData->fw_ractrl = true; } + padapter->bFWReady = true; + pHalData->fw_ractrl = true; +rtl8723b_InitializeFirmwareVars (padapter);if (pwrctrlpriv->reg_rfoff)
Luka Gejak
Reviewed-byRe: [PATCH v2 3/3] staging: rtl8723bs: remove unnecessary else after return in sdio_halinit.c
Quoted 27 lines · Luka Gejak
LGTM.
Reviewed-by Luka Gejak <[email protected]>Quoted 23 lines · Josh Hesketh
Remove else branch following a conditional return statement
Signed-off-by Josh Hesketh <[email protected]>---
v2:
- Rebased on staging-next
- Split from original patch 1/2drivers/staging/rtl8723bs/hal/sdio_halinit.c| 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +0
-3@@ -641,11 +641,11 @@ u32 rtl8723bs_hal_init(struct adapter *padapter) padapter->bFWReady = false; pHalData->fw_ractrl = false;return ret; - }else { - padapter->bFWReady = true; - pHalData->fw_ractrl = true; }
Quoted 6 lines
drivers/staging/rtl8723bs/hal/sdio_halinit.c u32 rtl8723bs_hal_init(struct adapter *padapter) · line 651
Quoted 6 lines
drivers/staging/rtl8723bs/hal/sdio_halinit.c +3
-0+ padapter->bFWReady = true; + pHalData->fw_ractrl = true; +rtl8723b_InitializeFirmwareVars (padapter);if (pwrctrlpriv->reg_rfoff)
EDIT: Sent from wrong email address(I hate thunderbird and I'm not near my laptop).
LGTM.
LGTM.
Quoted 104 lines · Josh Hesketh
Remove commented out dead code that have been dead since the driver was introduced to staging. Code can be recovered from git history if needed.
Signed-off-by Josh Hesketh <[email protected]>---
v2:
- Rebased on staging-next
- Split into separate patches per feedback
- Removed commented out dead code instead of fixing whitespacedrivers/staging/rtl8723bs/hal/sdio_halinit.c| 24 --------------------1 file changed, 24 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +0
-24@@ -46,8 +46,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)u16 value16;u32 value32;u8 ret; -/* u8 bMacPwrCtrlOn; */ -/* all of these MUST be configured before power on */ @@ -69,10 +67,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter) value16 |= EnPDN;/* Enable HW power down and RF on */ rtw_write16 (padapter,REG_APS_FSMCO , value16); -/* Enable CMD53 R/W Operation */ -/* bMacPwrCtrlOn = true; */ -/* rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); */ -rtw_write8 (padapter,REG_CR ,0x00 );/* Enable MAC DMA/WMAC/SCHEDULE/SEC block */ value16 =rtw_read16 (padapter,REG_CR );@@ -359,7 +353,6 @@ static void _InitNetworkType(struct adapter *padapter) value32 =rtw_read32 (padapter,REG_CR );/* TODO: use the other function to set network type */ -/* value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AD_HOC); */ value32 = (value32 & ~MASK_NETTYPE ) |_NETTYPE (NT_LINK_AP );rtw_write32 (padapter,REG_CR , value32);@@ -486,9 +479,6 @@ static void _initSdioAggregationSetting(struct adapter *padapter) {struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -/* Tx aggregation setting */ -/* sdio_AggSettingTxUpdate(padapter); */ -/* Rx aggregation setting */ HalRxAggr8723BSdio (padapter);@@ -640,9 +630,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)return _SUCCESS; } -/* Disable Interrupt first. */ -/* rtw_hal_disable_interrupt(padapter); */ - ret =_InitPowerOn_8723BS (padapter);if (ret == _FAIL)return _FAIL;@@ -661,8 +648,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtl8723b_InitializeFirmwareVars (padapter); -/* SIC_Init(padapter); */ -if (pwrctrlpriv->reg_rfoff) pwrctrlpriv->rf_pwrstate = rf_off;@@ -745,11 +730,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtw_hal_set_chnl_bw (padapter, padapter->registrypriv.channel,CHANNEL_WIDTH_20 ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ); -/* Record original value for template. This is arough data, we can only use the data */ -/* for power adjust. The value can not be adjustde according to different power!!! */ -/* pHalData->OriginalCckTxPwrIdx = pHalData->CurrentCckTxPwrIdx; */ -/* pHalData->OriginalOfdm24GTxPwrIdx = pHalData->CurrentOfdm24GTxPwrIdx; */ -rtl8723b_InitAntenna_Selection (padapter);/* */ @@ -791,8 +771,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* ack for xmit mgmt frames. */ rtw_write32 (padapter,REG_FWHW_TXQ_CTRL ,rtw_read32 (padapter,REG_FWHW_TXQ_CTRL ) |BIT (12 )); -/* pHalData->PreRpwmVal = SdioLocalCmd52Read1Byte(padapter, SDIO_REG_HRPWM1) & 0x80; */ - { pwrctrlpriv->rf_pwrstate = rf_on;@@ -1080,8 +1058,6 @@ static void _ReadPROMContent(struct adapter *padapter) pEEPROM->EepromOrEfuse = (eeValue &BOOT_FROM_EEPROM ) ? true : false; pEEPROM->bautoload_fail_flag = (eeValue &EEPROM_EN ) ? false : true; -/* pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE; */ -_ReadEfuseInfo8723BS (padapter); }
Luka Gejak
Reviewed-byQuoted 103 lines · Luka Gejak
LGTM.
Reviewed-by Luka Gejak <[email protected]>Quoted 99 lines · Josh Hesketh
Remove commented out dead code that have been dead since the driver was introduced to staging. Code can be recovered from git history if needed.
Signed-off-by Josh Hesketh <[email protected]>---
v2:
- Rebased on staging-next
- Split into separate patches per feedback
- Removed commented out dead code instead of fixing whitespacedrivers/staging/rtl8723bs/hal/sdio_halinit.c| 24 --------------------1 file changed, 24 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +0
-22@@ -46,8 +46,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)u16 value16;u32 value32;u8 ret; -/* u8 bMacPwrCtrlOn; */ -/* all of these MUST be configured before power on */ @@ -69,10 +67,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter) value16 |= EnPDN;/* Enable HW power down and RF on */ rtw_write16 (padapter,REG_APS_FSMCO , value16); -/* Enable CMD53 R/W Operation */ -/* bMacPwrCtrlOn = true; */ -/* rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); */ -rtw_write8 (padapter,REG_CR ,0x00 );/* Enable MAC DMA/WMAC/SCHEDULE/SEC block */ value16 =rtw_read16 (padapter,REG_CR );@@ -359,7 +353,6 @@ static void _InitNetworkType(struct adapter *padapter) value32 =rtw_read32 (padapter,REG_CR );/* TODO: use the other function to set network type */ -/* value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AD_HOC); */ value32 = (value32 & ~MASK_NETTYPE ) |_NETTYPE (NT_LINK_AP );rtw_write32 (padapter,REG_CR , value32);@@ -486,9 +479,6 @@ static void _initSdioAggregationSetting(struct adapter *padapter) {struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -/* Tx aggregation setting */ -/* sdio_AggSettingTxUpdate(padapter); */ -/* Rx aggregation setting */ HalRxAggr8723BSdio (padapter);@@ -640,9 +630,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)return _SUCCESS; } -/* Disable Interrupt first. */ -/* rtw_hal_disable_interrupt(padapter); */ - ret =_InitPowerOn_8723BS (padapter);if (ret == _FAIL)return _FAIL;@@ -661,8 +648,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtl8723b_InitializeFirmwareVars (padapter); -/* SIC_Init(padapter); */ -if (pwrctrlpriv->reg_rfoff) pwrctrlpriv->rf_pwrstate = rf_off;@@ -745,11 +730,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtw_hal_set_chnl_bw (padapter, padapter->registrypriv.channel,CHANNEL_WIDTH_20 ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ); -/* Record original value for template. This is arough data, we can only use the data */ -/* for power adjust. The value can not be adjustde according to different power!!! */ -/* pHalData->OriginalCckTxPwrIdx = pHalData->CurrentCckTxPwrIdx; */ -/* pHalData->OriginalOfdm24GTxPwrIdx = pHalData->CurrentOfdm24GTxPwrIdx; */ -rtl8723b_InitAntenna_Selection (padapter);/* */ @@ -791,8 +771,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* ack for xmit mgmt frames. */ rtw_write32 (padapter,REG_FWHW_TXQ_CTRL ,rtw_read32 (padapter,REG_FWHW_TXQ_CTRL ) |BIT (12 )); -/* pHalData->PreRpwmVal = SdioLocalCmd52Read1Byte(padapter, SDIO_REG_HRPWM1) & 0x80; */ - { pwrctrlpriv->rf_pwrstate = rf_on;@@ -1080,8 +1058,6 @@ static void _ReadPROMContent(struct adapter *padapter) pEEPROM->EepromOrEfuse = (eeValue &BOOT_FROM_EEPROM ) ? true : false; pEEPROM->bautoload_fail_flag = (eeValue &EEPROM_EN ) ? false : true;
Quoted 5 lines
drivers/staging/rtl8723bs/hal/sdio_halinit.c static void _ReadPROMContent(struct adapter *padapter) · line 1063
Quoted 5 lines
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0
-2-/* pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE; */ -_ReadEfuseInfo8723BS (padapter); }
EDIT: Sent from wrong email address(I hate thunderbird and I'm not near my laptop).
LGTM.
Greg Kroah-Hartman
maintainerQuoted 109 lines · Josh Hesketh
Remove commented out dead code that have been dead since the driver was introduced to staging. Code can be recovered from git history if needed.
Signed-off-by Josh Hesketh <[email protected]>Reviewed-by Luka Gejak <[email protected]>---
v2:
- Rebased on staging-next
- Split into separate patches per feedback
- Removed commented out dead code instead of fixing whitespacedrivers/staging/rtl8723bs/hal/sdio_halinit.c | 24 -------------------- 1 file changed, 24 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +0
-24@@ -46,8 +46,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)u16 value16;u32 value32;u8 ret; -/* u8 bMacPwrCtrlOn; */ -/* all of these MUST be configured before power on */ @@ -69,10 +67,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter) value16 |= EnPDN;/* Enable HW power down and RF on */ rtw_write16 (padapter,REG_APS_FSMCO , value16); -/* Enable CMD53 R/W Operation */ -/* bMacPwrCtrlOn = true; */ -/* rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); */ -rtw_write8 (padapter,REG_CR ,0x00 );/* Enable MAC DMA/WMAC/SCHEDULE/SEC block */ value16 =rtw_read16 (padapter,REG_CR );@@ -359,7 +353,6 @@ static void _InitNetworkType(struct adapter *padapter) value32 =rtw_read32 (padapter,REG_CR );/* TODO: use the other function to set network type */ -/* value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AD_HOC); */ value32 = (value32 & ~MASK_NETTYPE ) |_NETTYPE (NT_LINK_AP );rtw_write32 (padapter,REG_CR , value32);@@ -486,9 +479,6 @@ static void _initSdioAggregationSetting(struct adapter *padapter) {struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -/* Tx aggregation setting */ -/* sdio_AggSettingTxUpdate(padapter); */ -/* Rx aggregation setting */ HalRxAggr8723BSdio (padapter);@@ -640,9 +630,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)return _SUCCESS; } -/* Disable Interrupt first. */ -/* rtw_hal_disable_interrupt(padapter); */ - ret =_InitPowerOn_8723BS (padapter);if (ret == _FAIL)return _FAIL;@@ -661,8 +648,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtl8723b_InitializeFirmwareVars (padapter); -/* SIC_Init(padapter); */ -if (pwrctrlpriv->reg_rfoff) pwrctrlpriv->rf_pwrstate = rf_off;@@ -745,11 +730,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtw_hal_set_chnl_bw (padapter, padapter->registrypriv.channel,CHANNEL_WIDTH_20 ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ); -/* Record original value for template. This is arough data, we can only use the data */ -/* for power adjust. The value can not be adjustde according to different power!!! */ -/* pHalData->OriginalCckTxPwrIdx = pHalData->CurrentCckTxPwrIdx; */ -/* pHalData->OriginalOfdm24GTxPwrIdx = pHalData->CurrentOfdm24GTxPwrIdx; */ -rtl8723b_InitAntenna_Selection (padapter);/* */ @@ -791,8 +771,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* ack for xmit mgmt frames. */ rtw_write32 (padapter,REG_FWHW_TXQ_CTRL ,rtw_read32 (padapter,REG_FWHW_TXQ_CTRL ) |BIT (12 )); -/* pHalData->PreRpwmVal = SdioLocalCmd52Read1Byte(padapter, SDIO_REG_HRPWM1) & 0x80; */ - { pwrctrlpriv->rf_pwrstate = rf_on;@@ -1080,8 +1058,6 @@ static void _ReadPROMContent(struct adapter *padapter) pEEPROM->EepromOrEfuse = (eeValue &BOOT_FROM_EEPROM ) ? true : false; pEEPROM->bautoload_fail_flag = (eeValue &EEPROM_EN ) ? false : true; -/* pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE; */ -_ReadEfuseInfo8723BS (padapter); }Signature · 1 line
2.53.0
Does not apply to my tree anymore :(