Skip to contentSkip to conversation

Simplify local variable initialization

PATCH In review Erick Karanja 4 participants 17 messages Apr 5, 2025 – Apr 6, 2025 Staging

lore
Share & tools
lore
#0 lore raw

cover Simplify local variable initialization

This patchset address variable initialization at declaration. Key consideration that code executed between declaration and initialization is not necessary for initialization and changes do not affect the readability of the code.

The patches can be applied in any order.

Erick Karanja (2):
staging: rtl8723bs: Optimize variable initialization in

    rtl8723b_hal_init.c

staging: rtl8723bs: Initialize local variables at declaration

 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-------------
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    |  56 ++-----
 2 files changed, 57 insertions(+), 154 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-------------
 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +41 -114
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 void _8051Reset8723(struct adapter *padapter)
 {
 	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
 	/*  Reset 8051(WLMCU) IO wrapper */
 	/*  0x1c[8] = 0 */
 	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by Lucas@20130624 */
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);
 	io_rst &= ~BIT(0);
 	rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);
 
@@ -218,11 +217,10 @@ u8 g_fwdl_wintint_rdy_fail;
 static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
 {
 	s32 ret = _FAIL;
-	u32 value32;
+	u32 value32 = rtw_read32(adapter, REG_MCUFWDL);
 	unsigned long start = jiffies;
 	u32 cnt = 0;
 
-	value32 = rtw_read32(adapter, REG_MCUFWDL);
 	value32 |= MCUFWDL_RDY;
 	value32 &= ~WINTINI_RDY;
 	rtw_write32(adapter, REG_MCUFWDL, value32);
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
 	switch (type) {
 	case TYPE_EFUSE_MAX_SECTION:
 		{
-			u8 *pMax_section;
-			pMax_section = pOut;
+			u8 *pMax_section = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pMax_section = EFUSE_MAX_SECTION_8723B;
@@ -513,8 +510,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_EFUSE_REAL_CONTENT_LEN:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;
@@ -525,8 +521,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);
@@ -537,8 +532,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);
@@ -549,8 +543,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_EFUSE_MAP_LEN:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = EFUSE_MAX_MAP_LEN;
@@ -561,8 +554,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_EFUSE_PROTECT_BYTES_BANK:
 		{
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu1Tmp = EFUSE_OOB_PROTECT_BYTES;
@@ -573,8 +565,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_EFUSE_CONTENT_LEN_BANK:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;
@@ -585,8 +576,7 @@ void Hal_GetEfuseDefinition(
 
 	default:
 		{
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;
 			*pu1Tmp = 0;
 		}
 		break;
@@ -729,10 +719,9 @@ static void hal_ReadEFuse_WiFi(
 		}
 
 		if (offset < EFUSE_MAX_SECTION_8723B) {
-			u16 addr;
+			u16 addr = offset * PGPKT_DATA_SIZE;
 			/*  Get word enable value from PG header */
 
-			addr = offset * PGPKT_DATA_SIZE;
 			for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
 				/*  Check word enable condition in the section */
 				if (!(wden & (0x01<<i))) {
@@ -835,9 +824,8 @@ static void hal_ReadEFuse_BT(
 			}
 
 			if (offset < EFUSE_BT_MAX_SECTION) {
-				u16 addr;
+				u16 addr = offset * PGPKT_DATA_SIZE;
 
-				addr = offset * PGPKT_DATA_SIZE;
 				for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
 					/*  Check word enable condition in the section */
 					if (!(wden & (0x01<<i))) {
@@ -1153,14 +1141,10 @@ static u8 Hal_EfuseWordEnableDataWrite(
 
 static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
 {
-	u32 value32;
+	u32 value32 = rtw_read32(padapter, REG_SYS_CFG);
 	struct hal_version ChipVersion;
-	struct hal_com_data *pHalData;
-
-/* YJ, TODO, move read chip type here */
-	pHalData = GET_HAL_DATA(padapter);
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-	value32 = rtw_read32(padapter, REG_SYS_CFG);
 	ChipVersion.ICType = CHIP_8723B;
 	ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP);
 	ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);
@@ -1196,10 +1180,9 @@ void rtl8723b_InitBeaconParameters(struct adapter *padapter)
 {
 	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 	u16 val16;
-	u8 val8;
+	u8 val8 = DIS_TSF_UDT;
 
 
-	val8 = DIS_TSF_UDT;
 	val16 = val8 | (val8 << 8); /*  port0 and port1 */
 
 	/*  Enable prot0 beacon function for PSTDMA */
@@ -1287,22 +1270,7 @@ void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter)
 	u32 value32;
 	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
-	u32 bcn_ctrl_reg;
-
-	/* reset TSF, enable update TSF, correcting TSF On Beacon */
-
-	/* REG_BCN_INTERVAL */
-	/* REG_BCNDMATIM */
-	/* REG_ATIMWND */
-	/* REG_TBTT_PROHIBIT */
-	/* REG_DRVERLYINT */
-	/* REG_BCN_MAX_ERR */
-	/* REG_BCNTCFG (0x510) */
-	/* REG_DUAL_TSF_RST */
-	/* REG_BCN_CTRL (0x550) */
-
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;
 
 	/*  */
 	/*  ATIM window */
@@ -1416,9 +1384,7 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
 
 void rtl8723b_InitAntenna_Selection(struct adapter *padapter)
 {
-	u8 val;
-
-	val = rtw_read8(padapter, REG_LEDCFG2);
+	u8 val = rtw_read8(padapter, REG_LEDCFG2);
 	/*  Let 8051 take control antenna setting */
 	val |= BIT(7); /*  DPDT_SEL_EN, 0x4C[23] */
 	rtw_write8(padapter, REG_LEDCFG2, val);
@@ -1426,14 +1392,10 @@ void rtl8723b_InitAntenna_Selection(struct adapter *padapter)
 
 void rtl8723b_init_default_value(struct adapter *padapter)
 {
-	struct hal_com_data *pHalData;
-	struct dm_priv *pdmpriv;
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
+	struct dm_priv *pdmpriv = &pHalData->dmpriv;
 	u8 i;
 
-
-	pHalData = GET_HAL_DATA(padapter);
-	pdmpriv = &pHalData->dmpriv;
-
 	padapter->registrypriv.wireless_mode = WIRELESS_11BG_24N;
 
 	/*  init default value */
@@ -1478,9 +1440,7 @@ void rtl8723b_init_default_value(struct adapter *padapter)
 u8 GetEEPROMSize8723B(struct adapter *padapter)
 {
 	u8 size = 0;
-	u32 cr;
-
-	cr = rtw_read16(padapter, REG_9346CR);
+	u32 cr = rtw_read16(padapter, REG_9346CR);
 	/*  6: EEPROM used is 93C46, 4: boot from E-Fuse. */
 	size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
 
@@ -1495,13 +1455,9 @@ u8 GetEEPROMSize8723B(struct adapter *padapter)
 s32 rtl8723b_InitLLTTable(struct adapter *padapter)
 {
 	unsigned long start, passing_time;
-	u32 val32;
-	s32 ret;
-
-
-	ret = _FAIL;
+	u32 val32 = rtw_read32(padapter, REG_AUTO_LLT);
+	s32 ret = _FAIL;
 
-	val32 = rtw_read32(padapter, REG_AUTO_LLT);
 	val32 |= BIT_AUTO_INIT_LLT;
 	rtw_write32(padapter, REG_AUTO_LLT, val32);
 
@@ -1559,11 +1515,10 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u8 *hwinfo)
 {
 	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 /* 	struct hal_com_data	*pHalData = GET_HAL_DATA(padapter); */
-	u16 EEPROMId;
+	u16 EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));
 
 
 	/*  Check 0x8129 again for making sure autoload status!! */
-	EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));
 	if (EEPROMId != RTL_EEPROM_ID) {
 		pEEPROM->bautoload_fail_flag = true;
 	} else
@@ -2273,9 +2228,8 @@ void rtl8723b_fill_fake_txdesc(
 	/*  Encrypt the data frame if under security mode excepct null data. Suggested by CCW. */
 	/*  */
 	if (bDataFrame) {
-		u32 EncAlg;
+		u32 EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm;
 
-		EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm;
 		switch (EncAlg) {
 		case _NO_PRIVACY_:
 			SET_TX_DESC_SEC_TYPE_8723B(pDesc, 0x0);
@@ -2378,9 +2332,7 @@ static void hw_var_set_opmode(struct adapter *padapter, u8 variable, u8 *val)
 static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 {
 	u8 idx = 0;
-	u32 reg_macid;
-
-	reg_macid = REG_MACID;
+	u32 reg_macid = REG_MACID;
 
 	for (idx = 0 ; idx < 6; idx++)
 		rtw_write8(GET_PRIMARY_ADAPTER(padapter), (reg_macid+idx), val[idx]);
@@ -2389,9 +2341,7 @@ static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 {
 	u8 idx = 0;
-	u32 reg_bssid;
-
-	reg_bssid = REG_BSSID;
+	u32 reg_bssid = REG_BSSID;
 
 	for (idx = 0 ; idx < 6; idx++)
 		rtw_write8(padapter, (reg_bssid+idx), val[idx]);
@@ -2399,15 +2349,12 @@ static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 
 static void hw_var_set_bcn_func(struct adapter *padapter, u8 variable, u8 *val)
 {
-	u32 bcn_ctrl_reg;
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;
 
 	if (*(u8 *)val)
 		rtw_write8(padapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT));
 	else {
-		u8 val8;
-		val8 = rtw_read8(padapter, bcn_ctrl_reg);
+		u8 val8 = rtw_read8(padapter, bcn_ctrl_reg);
 		val8 &= ~(EN_BCN_FUNCTION | EN_TXBCN_RPT);
 
 		/*  Always enable port0 beacon function for PSTDMA */
@@ -2422,12 +2369,8 @@ static void hw_var_set_correct_tsf(struct adapter *padapter, u8 variable, u8 *va
 {
 	u8 val8;
 	u64 tsf;
-	struct mlme_ext_priv *pmlmeext;
-	struct mlme_ext_info *pmlmeinfo;
-
-
-	pmlmeext = &padapter->mlmeextpriv;
-	pmlmeinfo = &pmlmeext->mlmext_info;
+	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
 
 	tsf = pmlmeext->TSFValue-do_div(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024))-1024; /* us */
 
@@ -2479,17 +2422,11 @@ static void hw_var_set_mlme_disconnect(struct adapter *padapter, u8 variable, u8
 
 static void hw_var_set_mlme_sitesurvey(struct adapter *padapter, u8 variable, u8 *val)
 {
-	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl;
+	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl = REG_BCN_CTRL;
 	u16 value_rxfltmap2;
 	u8 val8;
-	struct hal_com_data *pHalData;
-	struct mlme_priv *pmlmepriv;
-
-
-	pHalData = GET_HAL_DATA(padapter);
-	pmlmepriv = &padapter->mlmepriv;
-
-	reg_bcn_ctl = REG_BCN_CTRL;
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
 	rcr_clear_bit = RCR_CBSSID_BCN;
 
@@ -2543,15 +2480,12 @@ static void hw_var_set_mlme_join(struct adapter *padapter, u8 variable, u8 *val)
 	u8 val8;
 	u16 val16;
 	u32 val32;
-	u8 RetryLimit;
-	u8 type;
-	struct mlme_priv *pmlmepriv;
+	u8 RetryLimit = 0x30;
+	u8 type = *(u8 *)val;
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 	struct eeprom_priv *pEEPROM;
 
 
-	RetryLimit = 0x30;
-	type = *(u8 *)val;
-	pmlmepriv = &padapter->mlmepriv;
 	pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 
 	if (type == 0) { /*  prepare to join */
@@ -2779,8 +2713,7 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
 
 	case HW_VAR_CHECK_BSSID:
 		{
-			u32 val32;
-			val32 = rtw_read32(padapter, REG_RCR);
+			u32 val32 = rtw_read32(padapter, REG_RCR);
 			if (*val)
 				val32 |= RCR_CBSSID_DATA|RCR_CBSSID_BCN;
 			else
@@ -2850,12 +2783,11 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
 
 	case HW_VAR_ACK_PREAMBLE:
 		{
-			u8 regTmp;
+			u8 regTmp = 0;
 			u8 bShortPreamble = *val;
 
 			/*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
 			/* regTmp = (pHalData->nCur40MhzPrimeSC)<<5; */
-			regTmp = 0;
 			if (bShortPreamble)
 				regTmp |= 0x80;
 			rtw_write8(padapter, REG_RRSR+2, regTmp);
@@ -3226,9 +3158,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
  */
 u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;
 
 	switch (variable) {
 	default:
@@ -3244,9 +3174,7 @@ u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
  */
 u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;
 
 	switch (variable) {
 	case HAL_DEF_MAX_RECVBUF_SZ:
@@ -3281,9 +3209,8 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
 	case HW_DEF_RA_INFO_DUMP:
 		{
 			u8 mac_id = *(u8 *)pval;
-			u32 cmd;
+			u32 cmd = 0x40000100 | mac_id;
 
-			cmd = 0x40000100 | mac_id;
 			rtw_write32(padapter, REG_HMEBOX_DBG_2_8723B, cmd);
 			msleep(10);
 			rtw_read32(padapter, 0x2F0);	// info 1
Signature · 1 line
2.43.0
#13 lore raw

PATCH 2/2 staging: rtl8723bs: Initialize local variables at declaration

In reply to Erick Karanja

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    | 56 ++++++-------------
 1 file changed, 16 insertions(+), 40 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +16 -40
index 5dc1c12fe03e..ebe9562a9606 100644
@@ -120,13 +120,10 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
  */
 s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
 {
-	struct xmit_priv *pxmitpriv;
+	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	u8 queue_empty, queue_pending;
 	s32 ret;
 
-
-	pxmitpriv = &padapter->xmitpriv;
-
 	if (wait_for_completion_interruptible(&pxmitpriv->xmit_comp)) {
 		netdev_emerg(padapter->pnetdev,
 			     "%s: down SdioXmitBufSema fail!\n", __func__);
@@ -168,10 +165,10 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
  */
 static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv)
 {
-	s32 err, ret;
+	s32 err = 0, ret;
 	u32 k = 0;
-	struct hw_xmit *hwxmits, *phwxmit;
-	u8 idx, hwentry;
+	struct hw_xmit *hwxmits = pxmitpriv->hwxmits, *phwxmit;
+	u8 idx, hwentry = pxmitpriv->hwxmit_entry;
 	struct tx_servq *ptxservq;
 	struct list_head *sta_plist, *sta_phead, *frame_plist, *frame_phead, *tmp;
 	struct xmit_frame *pxmitframe;
@@ -181,9 +178,6 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
 	u8 txdesc_size = TXDESC_SIZE;
 	int inx[4];
 
-	err = 0;
-	hwxmits = pxmitpriv->hwxmits;
-	hwentry = pxmitpriv->hwxmit_entry;
 	ptxservq = NULL;
 	pxmitframe = NULL;
 	pframe_queue = NULL;
@@ -326,8 +320,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
 		/*  dump xmit_buf to hw tx fifo */
 		if (pxmitbuf) {
 			if (pxmitbuf->len > 0) {
-				struct xmit_frame *pframe;
-				pframe = (struct xmit_frame *)pxmitbuf->priv_data;
+				struct xmit_frame *pframe = (struct xmit_frame *)pxmitbuf->priv_data;
 				pframe->agg_num = k;
 				pxmitbuf->agg_num = k;
 				rtl8723b_update_txdesc(pframe, pframe->buf_addr);
@@ -357,12 +350,9 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
  */
 static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
 {
-	struct xmit_priv *pxmitpriv;
+	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	s32 ret;
 
-
-	pxmitpriv = &padapter->xmitpriv;
-
 	if (wait_for_completion_interruptible(&pxmitpriv->SdioXmitStart)) {
 		netdev_emerg(padapter->pnetdev, "%s: SdioXmitStart fail!\n",
 			     __func__);
@@ -408,13 +398,9 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
 
 int rtl8723bs_xmit_thread(void *context)
 {
-	s32 ret;
-	struct adapter *padapter;
-	struct xmit_priv *pxmitpriv;
-
-	ret = _SUCCESS;
-	padapter = context;
-	pxmitpriv = &padapter->xmitpriv;
+	s32 ret = _SUCCESS;
+	struct adapter *padapter = context;
+	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 
 	allow_signal(SIGTERM);
 
@@ -435,16 +421,13 @@ s32 rtl8723bs_mgnt_xmit(
 )
 {
 	s32 ret = _SUCCESS;
-	struct pkt_attrib *pattrib;
-	struct xmit_buf *pxmitbuf;
+	struct pkt_attrib *pattrib = &pmgntframe->attrib;
+	struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
 	u8 *pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
 	u8 txdesc_size = TXDESC_SIZE;
 
-	pattrib = &pmgntframe->attrib;
-	pxmitbuf = pmgntframe->pxmitbuf;
-
 	rtl8723b_update_txdesc(pmgntframe, pmgntframe->buf_addr);
 
 	pxmitbuf->len = txdesc_size + pattrib->last_txcmdsz;
@@ -519,9 +502,8 @@ s32	rtl8723bs_hal_xmitframe_enqueue(
 )
 {
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
-	s32 err;
+	s32 err = rtw_xmitframe_enqueue(padapter, pxmitframe);
 
-	err = rtw_xmitframe_enqueue(padapter, pxmitframe);
 	if (err != _SUCCESS) {
 		rtw_free_xmitframe(pxmitpriv, pxmitframe);
 
@@ -543,10 +525,7 @@ s32	rtl8723bs_hal_xmitframe_enqueue(
 s32 rtl8723bs_init_xmit_priv(struct adapter *padapter)
 {
 	struct xmit_priv *xmitpriv = &padapter->xmitpriv;
-	struct hal_com_data *phal;
-
-
-	phal = GET_HAL_DATA(padapter);
+	struct hal_com_data *phal = GET_HAL_DATA(padapter);
 
 	spin_lock_init(&phal->SdioTxFIFOFreePageLock);
 	init_completion(&xmitpriv->SdioXmitStart);
@@ -557,16 +536,13 @@ s32 rtl8723bs_init_xmit_priv(struct adapter *padapter)
 
 void rtl8723bs_free_xmit_priv(struct adapter *padapter)
 {
-	struct xmit_priv *pxmitpriv;
+	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	struct xmit_buf *pxmitbuf;
-	struct __queue *pqueue;
-	struct list_head *plist, *phead;
+	struct __queue *pqueue = &pxmitpriv->pending_xmitbuf_queue;
+	struct list_head *plist, *phead = get_list_head(pqueue);
 	struct list_head tmplist;
 
 
-	pxmitpriv = &padapter->xmitpriv;
-	pqueue = &pxmitpriv->pending_xmitbuf_queue;
-	phead = get_list_head(pqueue);
 	INIT_LIST_HEAD(&tmplist);
 
 	spin_lock_bh(&pqueue->lock);
Signature · 1 line
2.43.0
maintainer
#14 lore raw

Re: [PATCH 2/2] staging: rtl8723bs: Initialize local variables at declaration

Quoted 30 lines · Erick Karanja

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    | 56 ++++++-------------
 1 file changed, 16 insertions(+), 40 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -4
index 5dc1c12fe03e..ebe9562a9606 100644
@@ -120,13 +120,10 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
  */
 s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
 {
-	struct xmit_priv *pxmitpriv;
+	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	u8 queue_empty, queue_pending;
 	s32 ret;
 
-
-	pxmitpriv = &padapter->xmitpriv;
-
 	if (wait_for_completion_interruptible(&pxmitpriv->xmit_comp)) {
 		netdev_emerg(padapter->pnetdev,
 			     "%s: down SdioXmitBufSema fail!\n", __func__);

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter) · line 171

Quoted 10 lines
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +3 -3
@@ -168,10 +165,10 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
  */
 static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv)
 {
-	s32 err, ret;
+	s32 err = 0, ret;
 	u32 k = 0;
-	struct hw_xmit *hwxmits, *phwxmit;
-	u8 idx, hwentry;
+	struct hw_xmit *hwxmits = pxmitpriv->hwxmits, *phwxmit;
+	u8 idx, hwentry = pxmitpriv->hwxmit_entry;

These lines are NOT more understandable and readable at all, sorry. You are mixing pre-initialized variables with not-initialized ones, making this harder to read and maintain over time.

Which would you want to come back to in 5 years to try to understand what is going on?

Keep it simple please.

thanks,

greg k-h

maintainer
#2 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

In reply to Erick Karanja
Quoted 16 lines · Erick Karanja

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-------------
 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 void _8051Reset8723(struct adapter *padapter)

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c static int _WriteFW(struct adapter *padapter, void *buffer, u32 size) · line 161

Quoted 10 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
 {
 	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
 	/*  Reset 8051(WLMCU) IO wrapper */
 	/*  0x1c[8] = 0 */
 	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by Lucas@20130624 */
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);

Ick, no, now the comment doesn't make much sense, right?

The changes you are making here are odd, why are you wanting to do this type of thing? What tool suggested that these are a good idea?

thanks,

greg k-h

#3 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

Quoted 30 lines · Greg KH
Quoted 16 lines · Erick Karanja

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-------------
 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 void _8051Reset8723(struct adapter *padapter)

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c static int _WriteFW(struct adapter *padapter, void *buffer, u32 size) · line 161

Quoted 10 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
 {
 	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
 	/*  Reset 8051(WLMCU) IO wrapper */
 	/*  0x1c[8] = 0 */
 	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by Lucas@20130624 */
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);

Ick, no, now the comment doesn't make much sense, right?

Quoted 2 lines

The changes you are making here are odd, why are you wanting to do this type of thing? What tool suggested that these are a good idea?

I made a Coccinelle script that does this, but it's not clever enough to detect the comments. Like for checkpatch, the results of Coccinelle have to be reviewed. Many can be inappropriate.

The goal is more like to address:

int ret;

ret = 0;

julia

Quoted 6 lines

thanks,

greg k-h

#15 lore raw

Re: [PATCH 2/2] staging: rtl8723bs: Initialize local variables at declaration

In reply to Greg KH
Quoted 46 lines · Greg KH
Quoted 30 lines · Erick Karanja

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    | 56 ++++++-------------
 1 file changed, 16 insertions(+), 40 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -4
index 5dc1c12fe03e..ebe9562a9606 100644
@@ -120,13 +120,10 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
  */
 s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
 {
-	struct xmit_priv *pxmitpriv;
+	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	u8 queue_empty, queue_pending;
 	s32 ret;
 
-
-	pxmitpriv = &padapter->xmitpriv;
-
 	if (wait_for_completion_interruptible(&pxmitpriv->xmit_comp)) {
 		netdev_emerg(padapter->pnetdev,
 			     "%s: down SdioXmitBufSema fail!\n", __func__);

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter) · line 171

Quoted 10 lines
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +3 -3
@@ -168,10 +165,10 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
  */
 static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv)
 {
-	s32 err, ret;
+	s32 err = 0, ret;
 	u32 k = 0;
-	struct hw_xmit *hwxmits, *phwxmit;
-	u8 idx, hwentry;
+	struct hw_xmit *hwxmits = pxmitpriv->hwxmits, *phwxmit;
+	u8 idx, hwentry = pxmitpriv->hwxmit_entry;

These lines are NOT more understandable and readable at all, sorry. You are mixing pre-initialized variables with not-initialized ones, making this harder to read and maintain over time.

Quoted 4 lines

Which would you want to come back to in 5 years to try to understand what is going on?

Keep it simple please.

This is another deficiency of Coccinelle. It doesn't really see the case where there are multiple declarations on a single line, since it is generally more valuable to be able to work on them individually.

I guess the first change above would be ok though.

julia

#4 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

In reply to Erick Karanja
Quoted 1 line · Erick Karanja

Optimize variable initialization by integrating the initialization

I would not use the work "optimize" for this. "Optimize" generally means run faster, or use less resources. Here you are just making the code more concise. There shouldn't be any significant changes in the generated code.

The goal is to make the code more readable, by moving trivial initializations up with the declarations instead of wasting a line on that. Since "trivial initialization" may be an opinion, the semantic patch is not very constrained about what the initialization is. But this means that the user has to use some judgement about this. Many results may be unsuitable.

julia

Quoted 433 lines

directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-------------
 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +41 -115
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 void _8051Reset8723(struct adapter *padapter)
 {
 	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
 	/*  Reset 8051(WLMCU) IO wrapper */
 	/*  0x1c[8] = 0 */
 	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by Lucas@20130624 */
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);
 	io_rst &= ~BIT(0);
 	rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);
 
@@ -218,11 +217,10 @@ u8 g_fwdl_wintint_rdy_fail;
 static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
 {
 	s32 ret = _FAIL;
-	u32 value32;
+	u32 value32 = rtw_read32(adapter, REG_MCUFWDL);
 	unsigned long start = jiffies;
 	u32 cnt = 0;
 
-	value32 = rtw_read32(adapter, REG_MCUFWDL);
 	value32 |= MCUFWDL_RDY;
 	value32 &= ~WINTINI_RDY;
 	rtw_write32(adapter, REG_MCUFWDL, value32);
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
 	switch (type) {
 	case TYPE_EFUSE_MAX_SECTION:
 		{
-			u8 *pMax_section;
-			pMax_section = pOut;
+			u8 *pMax_section = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pMax_section = EFUSE_MAX_SECTION_8723B;
@@ -513,8 +510,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_EFUSE_REAL_CONTENT_LEN:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;
@@ -525,8 +521,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);
@@ -537,8 +532,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);
@@ -549,8 +543,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_EFUSE_MAP_LEN:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = EFUSE_MAX_MAP_LEN;
@@ -561,8 +554,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_EFUSE_PROTECT_BYTES_BANK:
 		{
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu1Tmp = EFUSE_OOB_PROTECT_BYTES;
@@ -573,8 +565,7 @@ void Hal_GetEfuseDefinition(
 
 	case TYPE_EFUSE_CONTENT_LEN_BANK:
 		{
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;
 
 			if (efuseType == EFUSE_WIFI)
 				*pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;
@@ -585,8 +576,7 @@ void Hal_GetEfuseDefinition(
 
 	default:
 		{
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;
 			*pu1Tmp = 0;
 		}
 		break;
@@ -729,10 +719,9 @@ static void hal_ReadEFuse_WiFi(
 		}
 
 		if (offset < EFUSE_MAX_SECTION_8723B) {
-			u16 addr;
+			u16 addr = offset * PGPKT_DATA_SIZE;
 			/*  Get word enable value from PG header */
 
-			addr = offset * PGPKT_DATA_SIZE;
 			for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
 				/*  Check word enable condition in the section */
 				if (!(wden & (0x01<<i))) {
@@ -835,9 +824,8 @@ static void hal_ReadEFuse_BT(
 			}
 
 			if (offset < EFUSE_BT_MAX_SECTION) {
-				u16 addr;
+				u16 addr = offset * PGPKT_DATA_SIZE;
 
-				addr = offset * PGPKT_DATA_SIZE;
 				for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
 					/*  Check word enable condition in the section */
 					if (!(wden & (0x01<<i))) {
@@ -1153,14 +1141,10 @@ static u8 Hal_EfuseWordEnableDataWrite(
 
 static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
 {
-	u32 value32;
+	u32 value32 = rtw_read32(padapter, REG_SYS_CFG);
 	struct hal_version ChipVersion;
-	struct hal_com_data *pHalData;
-
-/* YJ, TODO, move read chip type here */
-	pHalData = GET_HAL_DATA(padapter);
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-	value32 = rtw_read32(padapter, REG_SYS_CFG);
 	ChipVersion.ICType = CHIP_8723B;
 	ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP);
 	ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);
@@ -1196,10 +1180,9 @@ void rtl8723b_InitBeaconParameters(struct adapter *padapter)
 {
 	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 	u16 val16;
-	u8 val8;
+	u8 val8 = DIS_TSF_UDT;
 
 
-	val8 = DIS_TSF_UDT;
 	val16 = val8 | (val8 << 8); /*  port0 and port1 */
 
 	/*  Enable prot0 beacon function for PSTDMA */
@@ -1287,22 +1270,7 @@ void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter)
 	u32 value32;
 	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
-	u32 bcn_ctrl_reg;
-
-	/* reset TSF, enable update TSF, correcting TSF On Beacon */
-
-	/* REG_BCN_INTERVAL */
-	/* REG_BCNDMATIM */
-	/* REG_ATIMWND */
-	/* REG_TBTT_PROHIBIT */
-	/* REG_DRVERLYINT */
-	/* REG_BCN_MAX_ERR */
-	/* REG_BCNTCFG (0x510) */
-	/* REG_DUAL_TSF_RST */
-	/* REG_BCN_CTRL (0x550) */
-
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;
 
 	/*  */
 	/*  ATIM window */
@@ -1416,9 +1384,7 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
 
 void rtl8723b_InitAntenna_Selection(struct adapter *padapter)
 {
-	u8 val;
-
-	val = rtw_read8(padapter, REG_LEDCFG2);
+	u8 val = rtw_read8(padapter, REG_LEDCFG2);
 	/*  Let 8051 take control antenna setting */
 	val |= BIT(7); /*  DPDT_SEL_EN, 0x4C[23] */
 	rtw_write8(padapter, REG_LEDCFG2, val);
@@ -1426,14 +1392,10 @@ void rtl8723b_InitAntenna_Selection(struct adapter *padapter)
 
 void rtl8723b_init_default_value(struct adapter *padapter)
 {
-	struct hal_com_data *pHalData;
-	struct dm_priv *pdmpriv;
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
+	struct dm_priv *pdmpriv = &pHalData->dmpriv;
 	u8 i;
 
-
-	pHalData = GET_HAL_DATA(padapter);
-	pdmpriv = &pHalData->dmpriv;
-
 	padapter->registrypriv.wireless_mode = WIRELESS_11BG_24N;
 
 	/*  init default value */
@@ -1478,9 +1440,7 @@ void rtl8723b_init_default_value(struct adapter *padapter)
 u8 GetEEPROMSize8723B(struct adapter *padapter)
 {
 	u8 size = 0;
-	u32 cr;
-
-	cr = rtw_read16(padapter, REG_9346CR);
+	u32 cr = rtw_read16(padapter, REG_9346CR);
 	/*  6: EEPROM used is 93C46, 4: boot from E-Fuse. */
 	size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
 
@@ -1495,13 +1455,9 @@ u8 GetEEPROMSize8723B(struct adapter *padapter)
 s32 rtl8723b_InitLLTTable(struct adapter *padapter)
 {
 	unsigned long start, passing_time;
-	u32 val32;
-	s32 ret;
-
-
-	ret = _FAIL;
+	u32 val32 = rtw_read32(padapter, REG_AUTO_LLT);
+	s32 ret = _FAIL;
 
-	val32 = rtw_read32(padapter, REG_AUTO_LLT);
 	val32 |= BIT_AUTO_INIT_LLT;
 	rtw_write32(padapter, REG_AUTO_LLT, val32);
 
@@ -1559,11 +1515,10 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u8 *hwinfo)
 {
 	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 /* 	struct hal_com_data	*pHalData = GET_HAL_DATA(padapter); */
-	u16 EEPROMId;
+	u16 EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));
 
 
 	/*  Check 0x8129 again for making sure autoload status!! */
-	EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));
 	if (EEPROMId != RTL_EEPROM_ID) {
 		pEEPROM->bautoload_fail_flag = true;
 	} else
@@ -2273,9 +2228,8 @@ void rtl8723b_fill_fake_txdesc(
 	/*  Encrypt the data frame if under security mode excepct null data. Suggested by CCW. */
 	/*  */
 	if (bDataFrame) {
-		u32 EncAlg;
+		u32 EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm;
 
-		EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm;
 		switch (EncAlg) {
 		case _NO_PRIVACY_:
 			SET_TX_DESC_SEC_TYPE_8723B(pDesc, 0x0);
@@ -2378,9 +2332,7 @@ static void hw_var_set_opmode(struct adapter *padapter, u8 variable, u8 *val)
 static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 {
 	u8 idx = 0;
-	u32 reg_macid;
-
-	reg_macid = REG_MACID;
+	u32 reg_macid = REG_MACID;
 
 	for (idx = 0 ; idx < 6; idx++)
 		rtw_write8(GET_PRIMARY_ADAPTER(padapter), (reg_macid+idx), val[idx]);
@@ -2389,9 +2341,7 @@ static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 {
 	u8 idx = 0;
-	u32 reg_bssid;
-
-	reg_bssid = REG_BSSID;
+	u32 reg_bssid = REG_BSSID;
 
 	for (idx = 0 ; idx < 6; idx++)
 		rtw_write8(padapter, (reg_bssid+idx), val[idx]);
@@ -2399,15 +2349,12 @@ static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 
 static void hw_var_set_bcn_func(struct adapter *padapter, u8 variable, u8 *val)
 {
-	u32 bcn_ctrl_reg;
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;
 
 	if (*(u8 *)val)
 		rtw_write8(padapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT));
 	else {
-		u8 val8;
-		val8 = rtw_read8(padapter, bcn_ctrl_reg);
+		u8 val8 = rtw_read8(padapter, bcn_ctrl_reg);
 		val8 &= ~(EN_BCN_FUNCTION | EN_TXBCN_RPT);
 
 		/*  Always enable port0 beacon function for PSTDMA */
@@ -2422,12 +2369,8 @@ static void hw_var_set_correct_tsf(struct adapter *padapter, u8 variable, u8 *va
 {
 	u8 val8;
 	u64 tsf;
-	struct mlme_ext_priv *pmlmeext;
-	struct mlme_ext_info *pmlmeinfo;
-
-
-	pmlmeext = &padapter->mlmeextpriv;
-	pmlmeinfo = &pmlmeext->mlmext_info;
+	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
 
 	tsf = pmlmeext->TSFValue-do_div(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024))-1024; /* us */
 
@@ -2479,17 +2422,11 @@ static void hw_var_set_mlme_disconnect(struct adapter *padapter, u8 variable, u8
 
 static void hw_var_set_mlme_sitesurvey(struct adapter *padapter, u8 variable, u8 *val)
 {
-	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl;
+	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl = REG_BCN_CTRL;
 	u16 value_rxfltmap2;
 	u8 val8;
-	struct hal_com_data *pHalData;
-	struct mlme_priv *pmlmepriv;
-
-
-	pHalData = GET_HAL_DATA(padapter);
-	pmlmepriv = &padapter->mlmepriv;
-
-	reg_bcn_ctl = REG_BCN_CTRL;
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
 	rcr_clear_bit = RCR_CBSSID_BCN;
 
@@ -2543,15 +2480,12 @@ static void hw_var_set_mlme_join(struct adapter *padapter, u8 variable, u8 *val)
 	u8 val8;
 	u16 val16;
 	u32 val32;
-	u8 RetryLimit;
-	u8 type;
-	struct mlme_priv *pmlmepriv;
+	u8 RetryLimit = 0x30;
+	u8 type = *(u8 *)val;
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 	struct eeprom_priv *pEEPROM;
 
 
-	RetryLimit = 0x30;
-	type = *(u8 *)val;
-	pmlmepriv = &padapter->mlmepriv;
 	pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 
 	if (type == 0) { /*  prepare to join */
@@ -2779,8 +2713,7 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
 
 	case HW_VAR_CHECK_BSSID:
 		{
-			u32 val32;
-			val32 = rtw_read32(padapter, REG_RCR);
+			u32 val32 = rtw_read32(padapter, REG_RCR);
 			if (*val)
 				val32 |= RCR_CBSSID_DATA|RCR_CBSSID_BCN;
 			else
@@ -2850,12 +2783,11 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
 
 	case HW_VAR_ACK_PREAMBLE:
 		{
-			u8 regTmp;
+			u8 regTmp = 0;
 			u8 bShortPreamble = *val;
 
 			/*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
 			/* regTmp = (pHalData->nCur40MhzPrimeSC)<<5; */
-			regTmp = 0;
 			if (bShortPreamble)
 				regTmp |= 0x80;
 			rtw_write8(padapter, REG_RRSR+2, regTmp);
@@ -3226,9 +3158,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
  */
 u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;
 
 	switch (variable) {
 	default:
@@ -3244,9 +3174,7 @@ u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
  */
 u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;
 
 	switch (variable) {
 	case HAL_DEF_MAX_RECVBUF_SZ:
@@ -3281,9 +3209,8 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
 	case HW_DEF_RA_INFO_DUMP:
 		{
 			u8 mac_id = *(u8 *)pval;
-			u32 cmd;
+			u32 cmd = 0x40000100 | mac_id;
 
-			cmd = 0x40000100 | mac_id;
 			rtw_write32(padapter, REG_HMEBOX_DBG_2_8723B, cmd);
 			msleep(10);
 			rtw_read32(padapter, 0x2F0);	// info 1
--

2.43.0

#5 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

Quoted 13 lines · Julia Lawall
Quoted 1 line · Erick Karanja

Optimize variable initialization by integrating the initialization

I would not use the work "optimize" for this.  "Optimize" generally means
run faster, or use less resources.  Here you are just making the code more
concise.  There shouldn't be any significant changes in the generated code.

Quoted 8 lines

The goal is to make the code more readable, by moving trivial initializations up with the declarations instead of wasting a line on that.  Since "trivial initialization" may be an opinion, the semantic patch is not very constrained about what the initialization is.  But this
means that the user has to use some judgement about this.  Many results
may be unsuitable.

Hello Julia. I agree that a change in the wording is necessary. When working on this patch I excluded spatch suggestions that would affect the code readability and make debugging difficult. I believe I should further inspect this scenarios as suggested.
Thank you.

Quoted 497 lines

julia

Quoted 494 lines

directly into the variable declaration in cases where the initialization
is simple and doesn't depend on other variables or complex expressions.
This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++---------
----

 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter,
 void *buffer, u32 size)
  void _8051Reset8723(struct adapter *padapter)
  {
  	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
  	/*  Reset 8051(WLMCU) IO wrapper */
  	/*  0x1c[8] = 0 */
  	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by

Lucas@20130624 */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);

  io_rst &= ~BIT(0); rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -218,11 +217,10 @@ u8 g_fwdl_wintint_rdy_fail;

 static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
 {
  s32 ret = _FAIL;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value32;
+	u32 value32 = rtw_read32(adapter, REG_MCUFWDL);

  unsigned long start = jiffies;
  u32 cnt = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	value32 = rtw_read32(adapter, REG_MCUFWDL);

  value32 |= MCUFWDL_RDY;
  value32 &= ~WINTINI_RDY; rtw_write32(adapter, REG_MCUFWDL, value32);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
  	switch (type) {

  case TYPE_EFUSE_MAX_SECTION:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pMax_section;
-			pMax_section = pOut;
+			u8 *pMax_section = pOut;

  if (efuseType == EFUSE_WIFI) *pMax_section = EFUSE_MAX_SECTION_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -513,8 +510,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_REAL_CONTENT_LEN:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -525,8 +521,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -537,8 +532,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -549,8 +543,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_MAP_LEN:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_MAX_MAP_LEN;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -561,8 +554,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_PROTECT_BYTES_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu1Tmp = EFUSE_OOB_PROTECT_BYTES;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -573,8 +565,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_CONTENT_LEN_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -585,8 +576,7 @@ void Hal_GetEfuseDefinition(
 

  default:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;

  *pu1Tmp = 0;
  }
  break;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -729,10 +719,9 @@ static void hal_ReadEFuse_WiFi(
  		}
 
  		if (offset < EFUSE_MAX_SECTION_8723B) {
-			u16 addr;
+			u16 addr = offset * PGPKT_DATA_SIZE;
  			/*  Get word enable value from PG header
 */
 
-			addr = offset * PGPKT_DATA_SIZE;
  			for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++)
 {

  /*  Check word enable condition in the section */
  if (!(wden & (0x01<<i))) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -835,9 +824,8 @@ static void hal_ReadEFuse_BT(
  			}
 
  			if (offset < EFUSE_BT_MAX_SECTION) {
-				u16 addr;
+				u16 addr = offset *
 PGPKT_DATA_SIZE;
 
-				addr = offset * PGPKT_DATA_SIZE;

  for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
  /*  Check word enable condition in the section */
  if (!(wden & (0x01<<i))) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1153,14 +1141,10 @@ static u8 Hal_EfuseWordEnableDataWrite(
 

 static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value32;
+	u32 value32 = rtw_read32(padapter, REG_SYS_CFG);

  struct hal_version ChipVersion;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -5
-	struct hal_com_data *pHalData;
-
-/* YJ, TODO, move read chip type here */
-	pHalData = GET_HAL_DATA(padapter);
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-	value32 = rtw_read32(padapter, REG_SYS_CFG);

  ChipVersion.ICType = CHIP_8723B; ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP :
NORMAL_CHIP);
  ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -1196,10 +1180,9 @@ void rtl8723b_InitBeaconParameters(struct
 adapter *padapter)
  {
  	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
  	u16 val16;
-	u8 val8;
+	u8 val8 = DIS_TSF_UDT;
 
 
-	val8 = DIS_TSF_UDT;

  val16 = val8 | (val8 << 8); /*  port0 and port1 */

  /*  Enable prot0 beacon function for PSTDMA */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -16
@@ -1287,22 +1270,7 @@ void
 rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter)
  	u32 value32;
  	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
  	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
-	u32 bcn_ctrl_reg;
-
-	/* reset TSF, enable update TSF, correcting TSF On Beacon
 */
-
-	/* REG_BCN_INTERVAL */
-	/* REG_BCNDMATIM */
-	/* REG_ATIMWND */
-	/* REG_TBTT_PROHIBIT */
-	/* REG_DRVERLYINT */
-	/* REG_BCN_MAX_ERR */
-	/* REG_BCNTCFG (0x510) */
-	/* REG_DUAL_TSF_RST */
-	/* REG_BCN_CTRL (0x550) */
-
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;
 

  /*  */
  /*  ATIM window */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
@@ -1416,9 +1384,7 @@ void rtl8723b_set_hal_ops(struct hal_ops
 *pHalFunc)
 
  void rtl8723b_InitAntenna_Selection(struct adapter *padapter)
  {
-	u8 val;
-
-	val = rtw_read8(padapter, REG_LEDCFG2);
+	u8 val = rtw_read8(padapter, REG_LEDCFG2);
  	/*  Let 8051 take control antenna setting */

  val |= BIT(7); /*  DPDT_SEL_EN, 0x4C[23] */ rtw_write8(padapter, REG_LEDCFG2, val);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +2 -6
@@ -1426,14 +1392,10 @@ void rtl8723b_InitAntenna_Selection(struct
 adapter *padapter)
 
  void rtl8723b_init_default_value(struct adapter *padapter)
  {
-	struct hal_com_data *pHalData;
-	struct dm_priv *pdmpriv;
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
+	struct dm_priv *pdmpriv = &pHalData->dmpriv;
  	u8 i;
 
-
-	pHalData = GET_HAL_DATA(padapter);
-	pdmpriv = &pHalData->dmpriv;
-
  	padapter->registrypriv.wireless_mode = WIRELESS_11BG_24N;
 

  /*  init default value */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -9
@@ -1478,9 +1440,7 @@ void rtl8723b_init_default_value(struct
 adapter *padapter)
  u8 GetEEPROMSize8723B(struct adapter *padapter)
  {
  	u8 size = 0;
-	u32 cr;
-
-	cr = rtw_read16(padapter, REG_9346CR);
+	u32 cr = rtw_read16(padapter, REG_9346CR);
  	/*  6: EEPROM used is 93C46, 4: boot from E-Fuse. */
  	size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
@@ -1495,13 +1455,9 @@ u8 GetEEPROMSize8723B(struct adapter
 *padapter)
  s32 rtl8723b_InitLLTTable(struct adapter *padapter)
  {
  	unsigned long start, passing_time;
-	u32 val32;
-	s32 ret;
-
-
-	ret = _FAIL;
+	u32 val32 = rtw_read32(padapter, REG_AUTO_LLT);
+	s32 ret = _FAIL;
 
-	val32 = rtw_read32(padapter, REG_AUTO_LLT);
  	val32 |= BIT_AUTO_INIT_LLT;
  	rtw_write32(padapter, REG_AUTO_LLT, val32);
@@ -1559,11 +1515,10 @@ void Hal_EfuseParseIDCode(struct adapter
 *padapter, u8 *hwinfo)
  {

  struct eeprom_priv *pEEPROM =
GET_EEPROM_EFUSE_PRIV(padapter);
 /*  struct hal_com_data *pHalData =
GET_HAL_DATA(padapter); */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u16 EEPROMId;
+	u16 EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));

  /*  Check 0x8129 again for making sure autoload status!! */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));

  if (EEPROMId != RTL_EEPROM_ID) { pEEPROM->bautoload_fail_flag = true; } else

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2273,9 +2228,8 @@ void rtl8723b_fill_fake_txdesc(
  	/*  Encrypt the data frame if under security mode excepct

null data. Suggested by CCW. */
  /*  */
  if (bDataFrame) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-		u32 EncAlg;
+		u32 EncAlg = padapter-
Quoted 1 line

securitypriv.dot11PrivacyAlgrthm;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-		EncAlg = padapter-
Quoted 1 line

securitypriv.dot11PrivacyAlgrthm;

  switch (EncAlg) {
  case _NO_PRIVACY_:
  SET_TX_DESC_SEC_TYPE_8723B(pDesc, 0x0);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2378,9 +2332,7 @@ static void hw_var_set_opmode(struct adapter
 *padapter, u8 variable, u8 *val)

 static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 {
  u8 idx = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 reg_macid;
-
-	reg_macid = REG_MACID;
+	u32 reg_macid = REG_MACID;

  for (idx = 0 ; idx < 6; idx++) rtw_write8(GET_PRIMARY_ADAPTER(padapter), (reg_macid+idx), val[idx]);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2389,9 +2341,7 @@ static void hw_var_set_macaddr(struct adapter
 *padapter, u8 variable, u8 *val)

 static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 {
  u8 idx = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 reg_bssid;
-
-	reg_bssid = REG_BSSID;
+	u32 reg_bssid = REG_BSSID;

  for (idx = 0 ; idx < 6; idx++) rtw_write8(padapter, (reg_bssid+idx), val[idx]);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2399,15 +2349,12 @@ static void hw_var_set_bssid(struct adapter
 *padapter, u8 variable, u8 *val)
 

 static void hw_var_set_bcn_func(struct adapter *padapter, u8 variable, u8 *val)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 bcn_ctrl_reg;
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;

  if (*(u8 *)val) rtw_write8(padapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT));
  else {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-		u8 val8;
-		val8 = rtw_read8(padapter, bcn_ctrl_reg);
+		u8 val8 = rtw_read8(padapter, bcn_ctrl_reg);

  val8 &= ~(EN_BCN_FUNCTION | EN_TXBCN_RPT);

  /*  Always enable port0 beacon function for PSTDMA */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2422,12 +2369,8 @@ static void hw_var_set_correct_tsf(struct

adapter *padapter, u8 variable, u8 *va
 {
  u8 val8;
  u64 tsf;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +2 -6
-	struct mlme_ext_priv *pmlmeext;
-	struct mlme_ext_info *pmlmeinfo;
-
-
-	pmlmeext = &padapter->mlmeextpriv;
-	pmlmeinfo = &pmlmeext->mlmext_info;
+	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;

  tsf = pmlmeext->TSFValue-do_div(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024))-1024; /* us */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2479,17 +2422,11 @@ static void
 hw_var_set_mlme_disconnect(struct adapter *padapter, u8 variable,

u8

 static void hw_var_set_mlme_sitesurvey(struct adapter *padapter, u8 variable, u8 *val)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl;
+	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl = REG_BCN_CTRL;

  u16 value_rxfltmap2;
  u8 val8;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +2 -8
-	struct hal_com_data *pHalData;
-	struct mlme_priv *pmlmepriv;
-
-
-	pHalData = GET_HAL_DATA(padapter);
-	pmlmepriv = &padapter->mlmepriv;
-
-	reg_bcn_ctl = REG_BCN_CTRL;
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

  rcr_clear_bit = RCR_CBSSID_BCN;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -6
@@ -2543,15 +2480,12 @@ static void hw_var_set_mlme_join(struct
 adapter *padapter, u8 variable, u8 *val)
  	u8 val8;
  	u16 val16;
  	u32 val32;
-	u8 RetryLimit;
-	u8 type;
-	struct mlme_priv *pmlmepriv;
+	u8 RetryLimit = 0x30;
+	u8 type = *(u8 *)val;
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
  	struct eeprom_priv *pEEPROM;
 
 
-	RetryLimit = 0x30;
-	type = *(u8 *)val;
-	pmlmepriv = &padapter->mlmepriv;
  	pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 

  if (type == 0) { /*  prepare to join */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2779,8 +2713,7 @@ void SetHwReg8723B(struct adapter *padapter,
 u8 variable, u8 *val)
 

  case HW_VAR_CHECK_BSSID:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u32 val32;
-			val32 = rtw_read32(padapter, REG_RCR);
+			u32 val32 = rtw_read32(padapter, REG_RCR);

  if (*val)
  val32 |=
RCR_CBSSID_DATA|RCR_CBSSID_BCN;
  else

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2850,12 +2783,11 @@ void SetHwReg8723B(struct adapter
 *padapter, u8 variable, u8 *val)
 

  case HW_VAR_ACK_PREAMBLE:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-			u8 regTmp;
+			u8 regTmp = 0;

  u8 bShortPreamble = *val;

  /*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
  /* regTmp = (pHalData-

Quoted 1 line

nCur40MhzPrimeSC)<<5; */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-			regTmp = 0;

  if (bShortPreamble)
  regTmp |= 0x80; rtw_write8(padapter, REG_RRSR+2, regTmp);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3226,9 +3158,7 @@ void GetHwReg8723B(struct adapter *padapter,
 u8 variable, u8 *val)
   */

 u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;

  switch (variable) {
  default:

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3244,9 +3174,7 @@ u8 SetHalDefVar8723B(struct adapter
 *padapter, enum hal_def_variable variable, v
   */

 u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;

  switch (variable) {
  case HAL_DEF_MAX_RECVBUF_SZ:

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3281,9 +3209,8 @@ u8 GetHalDefVar8723B(struct adapter
 *padapter, enum hal_def_variable variable, v

  case HW_DEF_RA_INFO_DUMP:
  {
  u8 mac_id = *(u8 *)pval;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u32 cmd;
+			u32 cmd = 0x40000100 | mac_id;
 
-			cmd = 0x40000100 | mac_id;

  rtw_write32(padapter,
REG_HMEBOX_DBG_2_8723B, cmd);
  msleep(10);
  rtw_read32(padapter, 0x2F0); // info 1
--
2.43.0

#6 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

Quoted 22 lines · Erick Karanja
Quoted 13 lines · Julia Lawall
Quoted 1 line · Erick Karanja

Optimize variable initialization by integrating the initialization

I would not use the work "optimize" for this.  "Optimize" generally means
run faster, or use less resources.  Here you are just making the code more
concise.  There shouldn't be any significant changes in the generated code.

Quoted 8 lines

The goal is to make the code more readable, by moving trivial initializations up with the declarations instead of wasting a line on that.  Since "trivial initialization" may be an opinion, the semantic patch is not very constrained about what the initialization is.  But this
means that the user has to use some judgement about this.  Many results
may be unsuitable.

Quoted 4 lines

Hello Julia. I agree that a change in the wording is necessary. When working on this patch I excluded spatch suggestions that would affect the code readability and make debugging difficult. I believe I should further inspect this scenarios as suggested.

It takes some time to get a feeling for what others may find readable. That's the whole point of the application period.

julia

Quoted 500 lines

Thank you.

Quoted 497 lines

julia

Quoted 494 lines

directly into the variable declaration in cases where the initialization
is simple and doesn't depend on other variables or complex expressions.
This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++---------
----

 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter,
 void *buffer, u32 size)
  void _8051Reset8723(struct adapter *padapter)
  {
  	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
  	/*  Reset 8051(WLMCU) IO wrapper */
  	/*  0x1c[8] = 0 */
  	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by

Lucas@20130624 */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);

  io_rst &= ~BIT(0); rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -218,11 +217,10 @@ u8 g_fwdl_wintint_rdy_fail;

 static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
 {
  s32 ret = _FAIL;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value32;
+	u32 value32 = rtw_read32(adapter, REG_MCUFWDL);

  unsigned long start = jiffies;
  u32 cnt = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	value32 = rtw_read32(adapter, REG_MCUFWDL);

  value32 |= MCUFWDL_RDY;
  value32 &= ~WINTINI_RDY; rtw_write32(adapter, REG_MCUFWDL, value32);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
  	switch (type) {

  case TYPE_EFUSE_MAX_SECTION:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pMax_section;
-			pMax_section = pOut;
+			u8 *pMax_section = pOut;

  if (efuseType == EFUSE_WIFI) *pMax_section = EFUSE_MAX_SECTION_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -513,8 +510,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_REAL_CONTENT_LEN:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -525,8 +521,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -537,8 +532,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -549,8 +543,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_MAP_LEN:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_MAX_MAP_LEN;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -561,8 +554,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_PROTECT_BYTES_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu1Tmp = EFUSE_OOB_PROTECT_BYTES;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -573,8 +565,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_CONTENT_LEN_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -585,8 +576,7 @@ void Hal_GetEfuseDefinition(
 

  default:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;

  *pu1Tmp = 0;
  }
  break;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -729,10 +719,9 @@ static void hal_ReadEFuse_WiFi(
  		}
 
  		if (offset < EFUSE_MAX_SECTION_8723B) {
-			u16 addr;
+			u16 addr = offset * PGPKT_DATA_SIZE;
  			/*  Get word enable value from PG header
 */
 
-			addr = offset * PGPKT_DATA_SIZE;
  			for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++)
 {

  /*  Check word enable condition in the section */
  if (!(wden & (0x01<<i))) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -835,9 +824,8 @@ static void hal_ReadEFuse_BT(
  			}
 
  			if (offset < EFUSE_BT_MAX_SECTION) {
-				u16 addr;
+				u16 addr = offset *
 PGPKT_DATA_SIZE;
 
-				addr = offset * PGPKT_DATA_SIZE;

  for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
  /*  Check word enable condition in the section */
  if (!(wden & (0x01<<i))) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1153,14 +1141,10 @@ static u8 Hal_EfuseWordEnableDataWrite(
 

 static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value32;
+	u32 value32 = rtw_read32(padapter, REG_SYS_CFG);

  struct hal_version ChipVersion;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -5
-	struct hal_com_data *pHalData;
-
-/* YJ, TODO, move read chip type here */
-	pHalData = GET_HAL_DATA(padapter);
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-	value32 = rtw_read32(padapter, REG_SYS_CFG);

  ChipVersion.ICType = CHIP_8723B; ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP :
NORMAL_CHIP);
  ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -1196,10 +1180,9 @@ void rtl8723b_InitBeaconParameters(struct
 adapter *padapter)
  {
  	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
  	u16 val16;
-	u8 val8;
+	u8 val8 = DIS_TSF_UDT;
 
 
-	val8 = DIS_TSF_UDT;

  val16 = val8 | (val8 << 8); /*  port0 and port1 */

  /*  Enable prot0 beacon function for PSTDMA */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -16
@@ -1287,22 +1270,7 @@ void
 rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter)
  	u32 value32;
  	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
  	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
-	u32 bcn_ctrl_reg;
-
-	/* reset TSF, enable update TSF, correcting TSF On Beacon
 */
-
-	/* REG_BCN_INTERVAL */
-	/* REG_BCNDMATIM */
-	/* REG_ATIMWND */
-	/* REG_TBTT_PROHIBIT */
-	/* REG_DRVERLYINT */
-	/* REG_BCN_MAX_ERR */
-	/* REG_BCNTCFG (0x510) */
-	/* REG_DUAL_TSF_RST */
-	/* REG_BCN_CTRL (0x550) */
-
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;
 

  /*  */
  /*  ATIM window */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
@@ -1416,9 +1384,7 @@ void rtl8723b_set_hal_ops(struct hal_ops
 *pHalFunc)
 
  void rtl8723b_InitAntenna_Selection(struct adapter *padapter)
  {
-	u8 val;
-
-	val = rtw_read8(padapter, REG_LEDCFG2);
+	u8 val = rtw_read8(padapter, REG_LEDCFG2);
  	/*  Let 8051 take control antenna setting */

  val |= BIT(7); /*  DPDT_SEL_EN, 0x4C[23] */ rtw_write8(padapter, REG_LEDCFG2, val);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +2 -6
@@ -1426,14 +1392,10 @@ void rtl8723b_InitAntenna_Selection(struct
 adapter *padapter)
 
  void rtl8723b_init_default_value(struct adapter *padapter)
  {
-	struct hal_com_data *pHalData;
-	struct dm_priv *pdmpriv;
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
+	struct dm_priv *pdmpriv = &pHalData->dmpriv;
  	u8 i;
 
-
-	pHalData = GET_HAL_DATA(padapter);
-	pdmpriv = &pHalData->dmpriv;
-
  	padapter->registrypriv.wireless_mode = WIRELESS_11BG_24N;
 

  /*  init default value */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -9
@@ -1478,9 +1440,7 @@ void rtl8723b_init_default_value(struct
 adapter *padapter)
  u8 GetEEPROMSize8723B(struct adapter *padapter)
  {
  	u8 size = 0;
-	u32 cr;
-
-	cr = rtw_read16(padapter, REG_9346CR);
+	u32 cr = rtw_read16(padapter, REG_9346CR);
  	/*  6: EEPROM used is 93C46, 4: boot from E-Fuse. */
  	size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
@@ -1495,13 +1455,9 @@ u8 GetEEPROMSize8723B(struct adapter
 *padapter)
  s32 rtl8723b_InitLLTTable(struct adapter *padapter)
  {
  	unsigned long start, passing_time;
-	u32 val32;
-	s32 ret;
-
-
-	ret = _FAIL;
+	u32 val32 = rtw_read32(padapter, REG_AUTO_LLT);
+	s32 ret = _FAIL;
 
-	val32 = rtw_read32(padapter, REG_AUTO_LLT);
  	val32 |= BIT_AUTO_INIT_LLT;
  	rtw_write32(padapter, REG_AUTO_LLT, val32);
@@ -1559,11 +1515,10 @@ void Hal_EfuseParseIDCode(struct adapter
 *padapter, u8 *hwinfo)
  {

  struct eeprom_priv *pEEPROM =
GET_EEPROM_EFUSE_PRIV(padapter);
 /*  struct hal_com_data *pHalData =
GET_HAL_DATA(padapter); */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u16 EEPROMId;
+	u16 EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));

  /*  Check 0x8129 again for making sure autoload status!! */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));

  if (EEPROMId != RTL_EEPROM_ID) { pEEPROM->bautoload_fail_flag = true; } else

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2273,9 +2228,8 @@ void rtl8723b_fill_fake_txdesc(
  	/*  Encrypt the data frame if under security mode excepct

null data. Suggested by CCW. */
  /*  */
  if (bDataFrame) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-		u32 EncAlg;
+		u32 EncAlg = padapter-
Quoted 1 line

securitypriv.dot11PrivacyAlgrthm;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-		EncAlg = padapter-
Quoted 1 line

securitypriv.dot11PrivacyAlgrthm;

  switch (EncAlg) {
  case _NO_PRIVACY_:
  SET_TX_DESC_SEC_TYPE_8723B(pDesc, 0x0);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2378,9 +2332,7 @@ static void hw_var_set_opmode(struct adapter
 *padapter, u8 variable, u8 *val)

 static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 {
  u8 idx = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 reg_macid;
-
-	reg_macid = REG_MACID;
+	u32 reg_macid = REG_MACID;

  for (idx = 0 ; idx < 6; idx++) rtw_write8(GET_PRIMARY_ADAPTER(padapter), (reg_macid+idx), val[idx]);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2389,9 +2341,7 @@ static void hw_var_set_macaddr(struct adapter
 *padapter, u8 variable, u8 *val)

 static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 {
  u8 idx = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 reg_bssid;
-
-	reg_bssid = REG_BSSID;
+	u32 reg_bssid = REG_BSSID;

  for (idx = 0 ; idx < 6; idx++) rtw_write8(padapter, (reg_bssid+idx), val[idx]);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2399,15 +2349,12 @@ static void hw_var_set_bssid(struct adapter
 *padapter, u8 variable, u8 *val)
 

 static void hw_var_set_bcn_func(struct adapter *padapter, u8 variable, u8 *val)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 bcn_ctrl_reg;
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;

  if (*(u8 *)val) rtw_write8(padapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT));
  else {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-		u8 val8;
-		val8 = rtw_read8(padapter, bcn_ctrl_reg);
+		u8 val8 = rtw_read8(padapter, bcn_ctrl_reg);

  val8 &= ~(EN_BCN_FUNCTION | EN_TXBCN_RPT);

  /*  Always enable port0 beacon function for PSTDMA */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2422,12 +2369,8 @@ static void hw_var_set_correct_tsf(struct

adapter *padapter, u8 variable, u8 *va
 {
  u8 val8;
  u64 tsf;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +2 -6
-	struct mlme_ext_priv *pmlmeext;
-	struct mlme_ext_info *pmlmeinfo;
-
-
-	pmlmeext = &padapter->mlmeextpriv;
-	pmlmeinfo = &pmlmeext->mlmext_info;
+	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;

  tsf = pmlmeext->TSFValue-do_div(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024))-1024; /* us */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2479,17 +2422,11 @@ static void
 hw_var_set_mlme_disconnect(struct adapter *padapter, u8 variable,

u8

 static void hw_var_set_mlme_sitesurvey(struct adapter *padapter, u8 variable, u8 *val)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl;
+	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl = REG_BCN_CTRL;

  u16 value_rxfltmap2;
  u8 val8;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +2 -8
-	struct hal_com_data *pHalData;
-	struct mlme_priv *pmlmepriv;
-
-
-	pHalData = GET_HAL_DATA(padapter);
-	pmlmepriv = &padapter->mlmepriv;
-
-	reg_bcn_ctl = REG_BCN_CTRL;
+	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

  rcr_clear_bit = RCR_CBSSID_BCN;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -6
@@ -2543,15 +2480,12 @@ static void hw_var_set_mlme_join(struct
 adapter *padapter, u8 variable, u8 *val)
  	u8 val8;
  	u16 val16;
  	u32 val32;
-	u8 RetryLimit;
-	u8 type;
-	struct mlme_priv *pmlmepriv;
+	u8 RetryLimit = 0x30;
+	u8 type = *(u8 *)val;
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
  	struct eeprom_priv *pEEPROM;
 
 
-	RetryLimit = 0x30;
-	type = *(u8 *)val;
-	pmlmepriv = &padapter->mlmepriv;
  	pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 

  if (type == 0) { /*  prepare to join */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2779,8 +2713,7 @@ void SetHwReg8723B(struct adapter *padapter,
 u8 variable, u8 *val)
 

  case HW_VAR_CHECK_BSSID:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u32 val32;
-			val32 = rtw_read32(padapter, REG_RCR);
+			u32 val32 = rtw_read32(padapter, REG_RCR);

  if (*val)
  val32 |=
RCR_CBSSID_DATA|RCR_CBSSID_BCN;
  else

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2850,12 +2783,11 @@ void SetHwReg8723B(struct adapter
 *padapter, u8 variable, u8 *val)
 

  case HW_VAR_ACK_PREAMBLE:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-			u8 regTmp;
+			u8 regTmp = 0;

  u8 bShortPreamble = *val;

  /*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
  /* regTmp = (pHalData-

Quoted 1 line

nCur40MhzPrimeSC)<<5; */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-			regTmp = 0;

  if (bShortPreamble)
  regTmp |= 0x80; rtw_write8(padapter, REG_RRSR+2, regTmp);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3226,9 +3158,7 @@ void GetHwReg8723B(struct adapter *padapter,
 u8 variable, u8 *val)
   */

 u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;

  switch (variable) {
  default:

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3244,9 +3174,7 @@ u8 SetHalDefVar8723B(struct adapter
 *padapter, enum hal_def_variable variable, v
   */

 u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;

  switch (variable) {
  case HAL_DEF_MAX_RECVBUF_SZ:

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3281,9 +3209,8 @@ u8 GetHalDefVar8723B(struct adapter
 *padapter, enum hal_def_variable variable, v

  case HW_DEF_RA_INFO_DUMP:
  {
  u8 mac_id = *(u8 *)pval;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u32 cmd;
+			u32 cmd = 0x40000100 | mac_id;
 
-			cmd = 0x40000100 | mac_id;

  rtw_write32(padapter,
REG_HMEBOX_DBG_2_8723B, cmd);
  msleep(10);
  rtw_read32(padapter, 0x2F0); // info 1
--
2.43.0

#7 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

Quoted 41 lines · Julia Lawall
Quoted 29 lines · Erick Karanja
Quoted 17 lines · Julia Lawall
Quoted 2 lines · Erick Karanja

Optimize variable initialization by integrating the initialization

I would not use the work "optimize" for this.  "Optimize" generally
means
run faster, or use less resources.  Here you are just making the code
more
concise.  There shouldn't be any significant changes in the generated
code.

Quoted 11 lines

The goal is to make the code more readable, by moving trivial initializations up with the declarations instead of wasting a line on
that.  Since "trivial initialization" may be an opinion, the semantic
patch is not very constrained about what the initialization is. But
this
means that the user has to use some judgement about this.  Many results
may be unsuitable.

Quoted 7 lines

Hello Julia. I agree that a change in the wording is necessary. When
working on this patch I excluded spatch suggestions that would affect
the code readability and make debugging difficult. I believe I should
further inspect this scenarios as suggested.

Quoted 3 lines

It takes some time to get a feeling for what others may find readable.
That's the whole point of the application period.

Thank you, I hope you could advice further especially on working with this semantic patch.
Erick

Quoted 542 lines

julia

Quoted 539 lines

Thank you.

Quoted 537 lines

julia

Quoted 534 lines

directly into the variable declaration in cases where the initialization
is simple and doesn't depend on other variables or complex expressions.
This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-----
----
----

 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter
 *padapter,
 void *buffer, u32 size)
  void _8051Reset8723(struct adapter *padapter)
  {
  	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
  	/*  Reset 8051(WLMCU) IO wrapper */
  	/*  0x1c[8] = 0 */
  	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by

Lucas@20130624 */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);

  io_rst &= ~BIT(0); rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -218,11 +217,10 @@ u8 g_fwdl_wintint_rdy_fail;
  static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt,

u32
timeout_ms)
 {
  s32 ret = _FAIL;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value32;
+	u32 value32 = rtw_read32(adapter, REG_MCUFWDL);

  unsigned long start = jiffies;
  u32 cnt = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	value32 = rtw_read32(adapter, REG_MCUFWDL);

  value32 |= MCUFWDL_RDY;
  value32 &= ~WINTINI_RDY; rtw_write32(adapter, REG_MCUFWDL, value32);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
  	switch (type) {

  case TYPE_EFUSE_MAX_SECTION:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pMax_section;
-			pMax_section = pOut;
+			u8 *pMax_section = pOut;

  if (efuseType == EFUSE_WIFI) *pMax_section = EFUSE_MAX_SECTION_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -513,8 +510,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_REAL_CONTENT_LEN:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -525,8 +521,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -537,8 +532,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -549,8 +543,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_MAP_LEN:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_MAX_MAP_LEN;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -561,8 +554,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_PROTECT_BYTES_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu1Tmp = EFUSE_OOB_PROTECT_BYTES;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -573,8 +565,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_CONTENT_LEN_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -585,8 +576,7 @@ void Hal_GetEfuseDefinition(
 

  default:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;

  *pu1Tmp = 0;
  }
  break;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
@@ -729,10 +719,9 @@ static void hal_ReadEFuse_WiFi(
  		}
 
  		if (offset < EFUSE_MAX_SECTION_8723B) {
-			u16 addr;
+			u16 addr = offset * PGPKT_DATA_SIZE;
  			/*  Get word enable value from PG

header
*/

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-			addr = offset * PGPKT_DATA_SIZE;

  for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++)
{
  /*  Check word enable condition in
the section */
  if (!(wden & (0x01<<i))) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -835,9 +824,8 @@ static void hal_ReadEFuse_BT(
  			}
 
  			if (offset < EFUSE_BT_MAX_SECTION) {
-				u16 addr;
+				u16 addr = offset *
 PGPKT_DATA_SIZE;
 
-				addr = offset *
 PGPKT_DATA_SIZE;

  for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
  /*  Check word enable condition in the section */
  if (!(wden & (0x01<<i))) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1153,14 +1141,10 @@ static u8 Hal_EfuseWordEnableDataWrite(
 

 static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value32;
+	u32 value32 = rtw_read32(padapter, REG_SYS_CFG);

  struct hal_version ChipVersion;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -4
-	struct hal_com_data *pHalData;
-
-/* YJ, TODO, move read chip type here */
-	pHalData = GET_HAL_DATA(padapter);
+	struct hal_com_data *pHalData =

GET_HAL_DATA(padapter);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	value32 = rtw_read32(padapter, REG_SYS_CFG);

  ChipVersion.ICType = CHIP_8723B; ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP :
NORMAL_CHIP);
  ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1196,10 +1180,9 @@ void

rtl8723b_InitBeaconParameters(struct
adapter *padapter)
 {
  struct hal_com_data *pHalData =
GET_HAL_DATA(padapter);
  u16 val16;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-	u8 val8;
+	u8 val8 = DIS_TSF_UDT;
 
 
-	val8 = DIS_TSF_UDT;

  val16 = val8 | (val8 << 8); /*  port0 and port1 */

  /*  Enable prot0 beacon function for PSTDMA */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1287,22 +1270,7 @@ void
 rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter)
  	u32 value32;

  struct mlme_ext_priv *pmlmeext = &padapter-

Quoted 1 line

mlmeextpriv;

  struct mlme_ext_info *pmlmeinfo = &pmlmeext-

Quoted 1 line

mlmext_info;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -3
-	u32 bcn_ctrl_reg;
-
-	/* reset TSF, enable update TSF, correcting TSF On

Beacon
*/

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -13
-
-	/* REG_BCN_INTERVAL */
-	/* REG_BCNDMATIM */
-	/* REG_ATIMWND */
-	/* REG_TBTT_PROHIBIT */
-	/* REG_DRVERLYINT */
-	/* REG_BCN_MAX_ERR */
-	/* REG_BCNTCFG (0x510) */
-	/* REG_DUAL_TSF_RST */
-	/* REG_BCN_CTRL (0x550) */
-
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;

  /*  */
  /*  ATIM window */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
@@ -1416,9 +1384,7 @@ void rtl8723b_set_hal_ops(struct hal_ops
 *pHalFunc)
 
  void rtl8723b_InitAntenna_Selection(struct adapter *padapter)
  {
-	u8 val;
-
-	val = rtw_read8(padapter, REG_LEDCFG2);
+	u8 val = rtw_read8(padapter, REG_LEDCFG2);
  	/*  Let 8051 take control antenna setting */

  val |= BIT(7); /*  DPDT_SEL_EN, 0x4C[23] */ rtw_write8(padapter, REG_LEDCFG2, val);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1426,14 +1392,10 @@ void

rtl8723b_InitAntenna_Selection(struct
adapter *padapter)

 void rtl8723b_init_default_value(struct adapter *padapter) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-	struct hal_com_data *pHalData;
-	struct dm_priv *pdmpriv;
+	struct hal_com_data *pHalData =

GET_HAL_DATA(padapter);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -0
+	struct dm_priv *pdmpriv = &pHalData->dmpriv;

  u8 i;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -4
-
-	pHalData = GET_HAL_DATA(padapter);
-	pdmpriv = &pHalData->dmpriv;
-

  padapter->registrypriv.wireless_mode =
WIRELESS_11BG_24N;

  /*  init default value */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -9
@@ -1478,9 +1440,7 @@ void rtl8723b_init_default_value(struct
 adapter *padapter)
  u8 GetEEPROMSize8723B(struct adapter *padapter)
  {
  	u8 size = 0;
-	u32 cr;
-
-	cr = rtw_read16(padapter, REG_9346CR);
+	u32 cr = rtw_read16(padapter, REG_9346CR);
  	/*  6: EEPROM used is 93C46, 4: boot from E-Fuse. */
  	size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
@@ -1495,13 +1455,9 @@ u8 GetEEPROMSize8723B(struct adapter
 *padapter)
  s32 rtl8723b_InitLLTTable(struct adapter *padapter)
  {
  	unsigned long start, passing_time;
-	u32 val32;
-	s32 ret;
-
-
-	ret = _FAIL;
+	u32 val32 = rtw_read32(padapter, REG_AUTO_LLT);
+	s32 ret = _FAIL;
 
-	val32 = rtw_read32(padapter, REG_AUTO_LLT);
  	val32 |= BIT_AUTO_INIT_LLT;
  	rtw_write32(padapter, REG_AUTO_LLT, val32);
@@ -1559,11 +1515,10 @@ void Hal_EfuseParseIDCode(struct

adapter
*padapter, u8 *hwinfo)
 {
  struct eeprom_priv *pEEPROM =
GET_EEPROM_EFUSE_PRIV(padapter);
 /*  struct hal_com_data *pHalData =
GET_HAL_DATA(padapter); */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u16 EEPROMId;
+	u16 EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));

  /*  Check 0x8129 again for making sure autoload status!!
*/

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));

  if (EEPROMId != RTL_EEPROM_ID) { pEEPROM->bautoload_fail_flag = true; } else

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2273,9 +2228,8 @@ void rtl8723b_fill_fake_txdesc(
  	/*  Encrypt the data frame if under security mode

excepct
null data. Suggested by CCW. */
  /*  */
  if (bDataFrame) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-		u32 EncAlg;
+		u32 EncAlg = padapter-
Quoted 1 line

securitypriv.dot11PrivacyAlgrthm;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-		EncAlg = padapter-
Quoted 1 line

securitypriv.dot11PrivacyAlgrthm;

  switch (EncAlg) {
  case _NO_PRIVACY_:
  SET_TX_DESC_SEC_TYPE_8723B(pDesc, 0x0);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2378,9 +2332,7 @@ static void hw_var_set_opmode(struct

adapter
*padapter, u8 variable, u8 *val)
 static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 {
  u8 idx = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 reg_macid;
-
-	reg_macid = REG_MACID;
+	u32 reg_macid = REG_MACID;

  for (idx = 0 ; idx < 6; idx++) rtw_write8(GET_PRIMARY_ADAPTER(padapter), (reg_macid+idx), val[idx]);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2389,9 +2341,7 @@ static void hw_var_set_macaddr(struct

adapter
*padapter, u8 variable, u8 *val)
 static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 {
  u8 idx = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 reg_bssid;
-
-	reg_bssid = REG_BSSID;
+	u32 reg_bssid = REG_BSSID;

  for (idx = 0 ; idx < 6; idx++) rtw_write8(padapter, (reg_bssid+idx), val[idx]);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2399,15 +2349,12 @@ static void hw_var_set_bssid(struct

adapter
*padapter, u8 variable, u8 *val)

 static void hw_var_set_bcn_func(struct adapter *padapter, u8 variable, u8 *val)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 bcn_ctrl_reg;
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;

  if (*(u8 *)val) rtw_write8(padapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT));
  else {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-		u8 val8;
-		val8 = rtw_read8(padapter, bcn_ctrl_reg);
+		u8 val8 = rtw_read8(padapter, bcn_ctrl_reg);

  val8 &= ~(EN_BCN_FUNCTION | EN_TXBCN_RPT);

  /*  Always enable port0 beacon function for PSTDMA
*/

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2422,12 +2369,8 @@ static void

hw_var_set_correct_tsf(struct
adapter *padapter, u8 variable, u8 *va
 {
  u8 val8;
  u64 tsf;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -6
-	struct mlme_ext_priv *pmlmeext;
-	struct mlme_ext_info *pmlmeinfo;
-
-
-	pmlmeext = &padapter->mlmeextpriv;
-	pmlmeinfo = &pmlmeext->mlmext_info;
+	struct mlme_ext_priv *pmlmeext = &padapter-
Quoted 1 line

mlmeextpriv;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -0
+	struct mlme_ext_info *pmlmeinfo = &pmlmeext-
Quoted 1 line

mlmext_info;

  tsf = pmlmeext->TSFValue-do_div(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024))-1024; /* us */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2479,17 +2422,11 @@ static void

hw_var_set_mlme_disconnect(struct adapter *padapter, u8 variable,
u8

 static void hw_var_set_mlme_sitesurvey(struct adapter *padapter,
u8 variable, u8 *val)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl;
+	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl =

REG_BCN_CTRL;
  u16 value_rxfltmap2;
  u8 val8;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -8
-	struct hal_com_data *pHalData;
-	struct mlme_priv *pmlmepriv;
-
-
-	pHalData = GET_HAL_DATA(padapter);
-	pmlmepriv = &padapter->mlmepriv;
-
-	reg_bcn_ctl = REG_BCN_CTRL;
+	struct hal_com_data *pHalData =

GET_HAL_DATA(padapter);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -0
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

  rcr_clear_bit = RCR_CBSSID_BCN;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -6
@@ -2543,15 +2480,12 @@ static void hw_var_set_mlme_join(struct
 adapter *padapter, u8 variable, u8 *val)
  	u8 val8;
  	u16 val16;
  	u32 val32;
-	u8 RetryLimit;
-	u8 type;
-	struct mlme_priv *pmlmepriv;
+	u8 RetryLimit = 0x30;
+	u8 type = *(u8 *)val;
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
  	struct eeprom_priv *pEEPROM;
 
 
-	RetryLimit = 0x30;
-	type = *(u8 *)val;
-	pmlmepriv = &padapter->mlmepriv;
  	pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 

  if (type == 0) { /*  prepare to join */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2779,8 +2713,7 @@ void SetHwReg8723B(struct adapter
 *padapter,
 u8 variable, u8 *val)
 

  case HW_VAR_CHECK_BSSID:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u32 val32;
-			val32 = rtw_read32(padapter, REG_RCR);
+			u32 val32 = rtw_read32(padapter,

REG_RCR);
  if (*val)
  val32 |=
RCR_CBSSID_DATA|RCR_CBSSID_BCN;
  else

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2850,12 +2783,11 @@ void SetHwReg8723B(struct adapter
 *padapter, u8 variable, u8 *val)
 

  case HW_VAR_ACK_PREAMBLE:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-			u8 regTmp;
+			u8 regTmp = 0;

  u8 bShortPreamble = *val;

  /*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
  /* regTmp = (pHalData-

Quoted 1 line

nCur40MhzPrimeSC)<<5; */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-			regTmp = 0;

  if (bShortPreamble) regTmp |= 0x80; rtw_write8(padapter, REG_RRSR+2, regTmp);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3226,9 +3158,7 @@ void GetHwReg8723B(struct adapter
 *padapter,
 u8 variable, u8 *val)
   */

 u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;

  switch (variable) {
  default:

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3244,9 +3174,7 @@ u8 SetHalDefVar8723B(struct adapter
 *padapter, enum hal_def_variable variable, v
   */

 u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;

  switch (variable) {
  case HAL_DEF_MAX_RECVBUF_SZ:

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3281,9 +3209,8 @@ u8 GetHalDefVar8723B(struct adapter
 *padapter, enum hal_def_variable variable, v

  case HW_DEF_RA_INFO_DUMP:
  {
  u8 mac_id = *(u8 *)pval;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u32 cmd;
+			u32 cmd = 0x40000100 | mac_id;
 
-			cmd = 0x40000100 | mac_id;

  rtw_write32(padapter,
REG_HMEBOX_DBG_2_8723B, cmd);
  msleep(10);
  rtw_read32(padapter, 0x2F0); //
info 1
--
2.43.0

#8 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

Quoted 42 lines · Erick Karanja
Quoted 41 lines · Julia Lawall
Quoted 36 lines · Erick Karanja
Quoted 17 lines · Julia Lawall
Quoted 2 lines · Erick Karanja

Optimize variable initialization by integrating the initialization

I would not use the work "optimize" for this.  "Optimize" generally
means
run faster, or use less resources.  Here you are just making the code
more
concise.  There shouldn't be any significant changes in the generated
code.

Quoted 11 lines

The goal is to make the code more readable, by moving trivial initializations up with the declarations instead of wasting a line on
that.  Since "trivial initialization" may be an opinion, the semantic
patch is not very constrained about what the initialization is. But
this
means that the user has to use some judgement about this.  Many results
may be unsuitable.

Hello Julia. I agree that a change in the wording is necessary. When
working on this patch I excluded spatch suggestions that would affect
the code readability and make debugging difficult. I believe I should
further inspect this scenarios as suggested.

Quoted 5 lines
Quoted 3 lines

It takes some time to get a feeling for what others may find readable.
That's the whole point of the application period.

Thank you, I hope you could advice further especially on working with this semantic patch.

Just do what looks good to you and see what happens.

You can also look at existing kernel code, and see places where people have combined declaration and initialization and pleasces where they have not done that.

If you have a question abotu a specific case, feel free to ask.

julia

Quoted 545 lines

Erick

Quoted 542 lines

julia

Quoted 539 lines

Thank you.

Quoted 537 lines

julia

Quoted 534 lines

directly into the variable declaration in cases where the initialization
is simple and doesn't depend on other variables or complex expressions.
This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-----
----
----

 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter
 *padapter,
 void *buffer, u32 size)
  void _8051Reset8723(struct adapter *padapter)
  {
  	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
  	/*  Reset 8051(WLMCU) IO wrapper */
  	/*  0x1c[8] = 0 */
  	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by

Lucas@20130624 */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);

  io_rst &= ~BIT(0); rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -218,11 +217,10 @@ u8 g_fwdl_wintint_rdy_fail;
  static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt,

u32
timeout_ms)
 {
  s32 ret = _FAIL;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value32;
+	u32 value32 = rtw_read32(adapter, REG_MCUFWDL);

  unsigned long start = jiffies;
  u32 cnt = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	value32 = rtw_read32(adapter, REG_MCUFWDL);

  value32 |= MCUFWDL_RDY;
  value32 &= ~WINTINI_RDY; rtw_write32(adapter, REG_MCUFWDL, value32);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
  	switch (type) {

  case TYPE_EFUSE_MAX_SECTION:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pMax_section;
-			pMax_section = pOut;
+			u8 *pMax_section = pOut;

  if (efuseType == EFUSE_WIFI) *pMax_section = EFUSE_MAX_SECTION_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -513,8 +510,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_REAL_CONTENT_LEN:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -525,8 +521,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -537,8 +532,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -549,8 +543,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_MAP_LEN:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_MAX_MAP_LEN;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -561,8 +554,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_PROTECT_BYTES_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu1Tmp = EFUSE_OOB_PROTECT_BYTES;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -573,8 +565,7 @@ void Hal_GetEfuseDefinition(
 

  case TYPE_EFUSE_CONTENT_LEN_BANK:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u16 *pu2Tmp;
-			pu2Tmp = pOut;
+			u16 *pu2Tmp = pOut;

  if (efuseType == EFUSE_WIFI) *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723B;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -585,8 +576,7 @@ void Hal_GetEfuseDefinition(
 

  default:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pu1Tmp;
-			pu1Tmp = pOut;
+			u8 *pu1Tmp = pOut;

  *pu1Tmp = 0;
  }
  break;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
@@ -729,10 +719,9 @@ static void hal_ReadEFuse_WiFi(
  		}
 
  		if (offset < EFUSE_MAX_SECTION_8723B) {
-			u16 addr;
+			u16 addr = offset * PGPKT_DATA_SIZE;
  			/*  Get word enable value from PG

header
*/

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-			addr = offset * PGPKT_DATA_SIZE;

  for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++)
{
  /*  Check word enable condition in
the section */
  if (!(wden & (0x01<<i))) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -835,9 +824,8 @@ static void hal_ReadEFuse_BT(
  			}
 
  			if (offset < EFUSE_BT_MAX_SECTION) {
-				u16 addr;
+				u16 addr = offset *
 PGPKT_DATA_SIZE;
 
-				addr = offset *
 PGPKT_DATA_SIZE;

  for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
  /*  Check word enable condition in the section */
  if (!(wden & (0x01<<i))) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1153,14 +1141,10 @@ static u8 Hal_EfuseWordEnableDataWrite(
 

 static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value32;
+	u32 value32 = rtw_read32(padapter, REG_SYS_CFG);

  struct hal_version ChipVersion;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -4
-	struct hal_com_data *pHalData;
-
-/* YJ, TODO, move read chip type here */
-	pHalData = GET_HAL_DATA(padapter);
+	struct hal_com_data *pHalData =

GET_HAL_DATA(padapter);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	value32 = rtw_read32(padapter, REG_SYS_CFG);

  ChipVersion.ICType = CHIP_8723B; ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP :
NORMAL_CHIP);
  ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1196,10 +1180,9 @@ void

rtl8723b_InitBeaconParameters(struct
adapter *padapter)
 {
  struct hal_com_data *pHalData =
GET_HAL_DATA(padapter);
  u16 val16;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-	u8 val8;
+	u8 val8 = DIS_TSF_UDT;
 
 
-	val8 = DIS_TSF_UDT;

  val16 = val8 | (val8 << 8); /*  port0 and port1 */

  /*  Enable prot0 beacon function for PSTDMA */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1287,22 +1270,7 @@ void
 rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter)
  	u32 value32;

  struct mlme_ext_priv *pmlmeext = &padapter-

Quoted 1 line

mlmeextpriv;

  struct mlme_ext_info *pmlmeinfo = &pmlmeext-

Quoted 1 line

mlmext_info;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -3
-	u32 bcn_ctrl_reg;
-
-	/* reset TSF, enable update TSF, correcting TSF On

Beacon
*/

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -13
-
-	/* REG_BCN_INTERVAL */
-	/* REG_BCNDMATIM */
-	/* REG_ATIMWND */
-	/* REG_TBTT_PROHIBIT */
-	/* REG_DRVERLYINT */
-	/* REG_BCN_MAX_ERR */
-	/* REG_BCNTCFG (0x510) */
-	/* REG_DUAL_TSF_RST */
-	/* REG_BCN_CTRL (0x550) */
-
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;

  /*  */
  /*  ATIM window */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
@@ -1416,9 +1384,7 @@ void rtl8723b_set_hal_ops(struct hal_ops
 *pHalFunc)
 
  void rtl8723b_InitAntenna_Selection(struct adapter *padapter)
  {
-	u8 val;
-
-	val = rtw_read8(padapter, REG_LEDCFG2);
+	u8 val = rtw_read8(padapter, REG_LEDCFG2);
  	/*  Let 8051 take control antenna setting */

  val |= BIT(7); /*  DPDT_SEL_EN, 0x4C[23] */ rtw_write8(padapter, REG_LEDCFG2, val);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -1426,14 +1392,10 @@ void

rtl8723b_InitAntenna_Selection(struct
adapter *padapter)

 void rtl8723b_init_default_value(struct adapter *padapter) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-	struct hal_com_data *pHalData;
-	struct dm_priv *pdmpriv;
+	struct hal_com_data *pHalData =

GET_HAL_DATA(padapter);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -0
+	struct dm_priv *pdmpriv = &pHalData->dmpriv;

  u8 i;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -4
-
-	pHalData = GET_HAL_DATA(padapter);
-	pdmpriv = &pHalData->dmpriv;
-

  padapter->registrypriv.wireless_mode =
WIRELESS_11BG_24N;

  /*  init default value */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -9
@@ -1478,9 +1440,7 @@ void rtl8723b_init_default_value(struct
 adapter *padapter)
  u8 GetEEPROMSize8723B(struct adapter *padapter)
  {
  	u8 size = 0;
-	u32 cr;
-
-	cr = rtw_read16(padapter, REG_9346CR);
+	u32 cr = rtw_read16(padapter, REG_9346CR);
  	/*  6: EEPROM used is 93C46, 4: boot from E-Fuse. */
  	size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
@@ -1495,13 +1455,9 @@ u8 GetEEPROMSize8723B(struct adapter
 *padapter)
  s32 rtl8723b_InitLLTTable(struct adapter *padapter)
  {
  	unsigned long start, passing_time;
-	u32 val32;
-	s32 ret;
-
-
-	ret = _FAIL;
+	u32 val32 = rtw_read32(padapter, REG_AUTO_LLT);
+	s32 ret = _FAIL;
 
-	val32 = rtw_read32(padapter, REG_AUTO_LLT);
  	val32 |= BIT_AUTO_INIT_LLT;
  	rtw_write32(padapter, REG_AUTO_LLT, val32);
@@ -1559,11 +1515,10 @@ void Hal_EfuseParseIDCode(struct

adapter
*padapter, u8 *hwinfo)
 {
  struct eeprom_priv *pEEPROM =
GET_EEPROM_EFUSE_PRIV(padapter);
 /*  struct hal_com_data *pHalData =
GET_HAL_DATA(padapter); */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u16 EEPROMId;
+	u16 EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));

  /*  Check 0x8129 again for making sure autoload status!!
*/

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));

  if (EEPROMId != RTL_EEPROM_ID) { pEEPROM->bautoload_fail_flag = true; } else

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2273,9 +2228,8 @@ void rtl8723b_fill_fake_txdesc(
  	/*  Encrypt the data frame if under security mode

excepct
null data. Suggested by CCW. */
  /*  */
  if (bDataFrame) {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-		u32 EncAlg;
+		u32 EncAlg = padapter-
Quoted 1 line

securitypriv.dot11PrivacyAlgrthm;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-		EncAlg = padapter-
Quoted 1 line

securitypriv.dot11PrivacyAlgrthm;

  switch (EncAlg) {
  case _NO_PRIVACY_:
  SET_TX_DESC_SEC_TYPE_8723B(pDesc, 0x0);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2378,9 +2332,7 @@ static void hw_var_set_opmode(struct

adapter
*padapter, u8 variable, u8 *val)
 static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *val)
 {
  u8 idx = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 reg_macid;
-
-	reg_macid = REG_MACID;
+	u32 reg_macid = REG_MACID;

  for (idx = 0 ; idx < 6; idx++) rtw_write8(GET_PRIMARY_ADAPTER(padapter), (reg_macid+idx), val[idx]);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2389,9 +2341,7 @@ static void hw_var_set_macaddr(struct

adapter
*padapter, u8 variable, u8 *val)
 static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *val)
 {
  u8 idx = 0;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 reg_bssid;
-
-	reg_bssid = REG_BSSID;
+	u32 reg_bssid = REG_BSSID;

  for (idx = 0 ; idx < 6; idx++) rtw_write8(padapter, (reg_bssid+idx), val[idx]);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2399,15 +2349,12 @@ static void hw_var_set_bssid(struct

adapter
*padapter, u8 variable, u8 *val)

 static void hw_var_set_bcn_func(struct adapter *padapter, u8 variable, u8 *val)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u32 bcn_ctrl_reg;
-
-	bcn_ctrl_reg = REG_BCN_CTRL;
+	u32 bcn_ctrl_reg = REG_BCN_CTRL;

  if (*(u8 *)val) rtw_write8(padapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT));
  else {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-		u8 val8;
-		val8 = rtw_read8(padapter, bcn_ctrl_reg);
+		u8 val8 = rtw_read8(padapter, bcn_ctrl_reg);

  val8 &= ~(EN_BCN_FUNCTION | EN_TXBCN_RPT);

  /*  Always enable port0 beacon function for PSTDMA
*/

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2422,12 +2369,8 @@ static void

hw_var_set_correct_tsf(struct
adapter *padapter, u8 variable, u8 *va
 {
  u8 val8;
  u64 tsf;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -6
-	struct mlme_ext_priv *pmlmeext;
-	struct mlme_ext_info *pmlmeinfo;
-
-
-	pmlmeext = &padapter->mlmeextpriv;
-	pmlmeinfo = &pmlmeext->mlmext_info;
+	struct mlme_ext_priv *pmlmeext = &padapter-
Quoted 1 line

mlmeextpriv;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -0
+	struct mlme_ext_info *pmlmeinfo = &pmlmeext-
Quoted 1 line

mlmext_info;

  tsf = pmlmeext->TSFValue-do_div(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024))-1024; /* us */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2479,17 +2422,11 @@ static void

hw_var_set_mlme_disconnect(struct adapter *padapter, u8 variable,
u8

 static void hw_var_set_mlme_sitesurvey(struct adapter *padapter,
u8 variable, u8 *val)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl;
+	u32 value_rcr, rcr_clear_bit, reg_bcn_ctl =

REG_BCN_CTRL;
  u16 value_rxfltmap2;
  u8 val8;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -8
-	struct hal_com_data *pHalData;
-	struct mlme_priv *pmlmepriv;
-
-
-	pHalData = GET_HAL_DATA(padapter);
-	pmlmepriv = &padapter->mlmepriv;
-
-	reg_bcn_ctl = REG_BCN_CTRL;
+	struct hal_com_data *pHalData =

GET_HAL_DATA(padapter);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -0
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

  rcr_clear_bit = RCR_CBSSID_BCN;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -6
@@ -2543,15 +2480,12 @@ static void hw_var_set_mlme_join(struct
 adapter *padapter, u8 variable, u8 *val)
  	u8 val8;
  	u16 val16;
  	u32 val32;
-	u8 RetryLimit;
-	u8 type;
-	struct mlme_priv *pmlmepriv;
+	u8 RetryLimit = 0x30;
+	u8 type = *(u8 *)val;
+	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
  	struct eeprom_priv *pEEPROM;
 
 
-	RetryLimit = 0x30;
-	type = *(u8 *)val;
-	pmlmepriv = &padapter->mlmepriv;
  	pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
 

  if (type == 0) { /*  prepare to join */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2779,8 +2713,7 @@ void SetHwReg8723B(struct adapter
 *padapter,
 u8 variable, u8 *val)
 

  case HW_VAR_CHECK_BSSID:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u32 val32;
-			val32 = rtw_read32(padapter, REG_RCR);
+			u32 val32 = rtw_read32(padapter,

REG_RCR);
  if (*val)
  val32 |=
RCR_CBSSID_DATA|RCR_CBSSID_BCN;
  else

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -2850,12 +2783,11 @@ void SetHwReg8723B(struct adapter
 *padapter, u8 variable, u8 *val)
 

  case HW_VAR_ACK_PREAMBLE:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
-			u8 regTmp;
+			u8 regTmp = 0;

  u8 bShortPreamble = *val;

  /*  Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */
  /* regTmp = (pHalData-

Quoted 1 line

nCur40MhzPrimeSC)<<5; */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-			regTmp = 0;

  if (bShortPreamble) regTmp |= 0x80; rtw_write8(padapter, REG_RRSR+2, regTmp);

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3226,9 +3158,7 @@ void GetHwReg8723B(struct adapter
 *padapter,
 u8 variable, u8 *val)
   */

 u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;

  switch (variable) {
  default:

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3244,9 +3174,7 @@ u8 SetHalDefVar8723B(struct adapter
 *padapter, enum hal_def_variable variable, v
   */

 u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, void *pval)
 {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
-	u8 bResult;
-
-	bResult = _SUCCESS;
+	u8 bResult = _SUCCESS;

  switch (variable) {
  case HAL_DEF_MAX_RECVBUF_SZ:

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -3281,9 +3209,8 @@ u8 GetHalDefVar8723B(struct adapter
 *padapter, enum hal_def_variable variable, v

  case HW_DEF_RA_INFO_DUMP:
  {
  u8 mac_id = *(u8 *)pval;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u32 cmd;
+			u32 cmd = 0x40000100 | mac_id;
 
-			cmd = 0x40000100 | mac_id;

  rtw_write32(padapter,
REG_HMEBOX_DBG_2_8723B, cmd);
  msleep(10);
  rtw_read32(padapter, 0x2F0); //
info 1
--
2.43.0

#9 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

In reply to Erick Karanja
Quoted 18 lines · Erick Karanja

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-------------
 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 void _8051Reset8723(struct adapter *padapter)
 {
 	u8 cpu_rst;

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c static int _WriteFW(struct adapter *padapter, void *buffer, u32 size) · line 162

Quoted 10 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
 	/*  Reset 8051(WLMCU) IO wrapper */
 	/*  0x1c[8] = 0 */
 	/*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by Lucas@20130624 */
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);
 	io_rst &= ~BIT(0);
 	rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);

I hate this. It's a bad idea to put "code" in the declaration block.

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c void Hal_GetEfuseDefinition( · line 502

Quoted 7 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
 	switch (type) {
 	case TYPE_EFUSE_MAX_SECTION:
 		{
-			u8 *pMax_section;
-			pMax_section = pOut;
+			u8 *pMax_section = pOut;

This is fine because "pOut" is a variable. It doesn't have side effects and it's not "code" in that sense.

regards,
dan carpenter

#16 lore raw

Re: [PATCH 2/2] staging: rtl8723bs: Initialize local variables at declaration

In reply to Julia Lawall
Quoted 2 lines · Julia Lawall

I guess the first change above would be ok though.

Here is the first change:

- struct xmit_priv *pxmitpriv;
+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
u8 queue_empty, queue_pending;
s32 ret;

-
- pxmitpriv = &padapter->xmitpriv;
-

Yes. This is a nice change.

regards,
dan carpenter

#10 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

In reply to Dan Carpenter
Quoted 26 lines · Dan Carpenter
Quoted 22 lines · Erick Karanja

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization is simple and doesn't depend on other variables or complex expressions. This makes the code more concise and readable.

---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++-------------

1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 void _8051Reset8723(struct adapter *padapter)
 {
   u8 cpu_rst;
-    u8 io_rst;
+    u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
Quoted 8 lines

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c static int _WriteFW(struct adapter *padapter, void *buffer, u32 size) · line 162

Quoted 6 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
   /*  Reset 8051(WLMCU) IO wrapper */
   /*  0x1c[8] = 0 */
   /*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by Lucas@20130624 */
-    io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);
   io_rst &= ~BIT(0);
   rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);

I hate this. It's a bad idea to put "code" in the declaration block.

Erick, you can look around in the output of the semantic patch and see if all of the ones with function calls are undesirable. If that’s the case you can post to the outreachy mailing list a revised semantic patch that doesn’t report on that case.

Julia

Quoted 15 lines

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c void Hal_GetEfuseDefinition( · line 502

Quoted 7 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
   switch (type) {
   case TYPE_EFUSE_MAX_SECTION:
       {
-            u8 *pMax_section;
-            pMax_section = pOut;
+            u8 *pMax_section = pOut;

This is fine because "pOut" is a variable. It doesn't have side effects and it's not "code" in that sense.

regards,
dan carpenter

#11 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

Quoted 44 lines · Julia Lawall
Quoted 33 lines

On 5 Apr 2025, at 10:19, Dan Carpenter <[email protected]> wrote:

Quoted 28 lines · Erick Karanja

Optimize variable initialization by integrating the initialization
directly into the variable declaration in cases where the initialization
is simple and doesn't depend on other variables or complex expressions.
This makes the code more concise and readable.

---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++--------
-----

1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter
 *padapter, void *buffer, u32 size)
 void _8051Reset8723(struct adapter *padapter)
 {
    u8 cpu_rst;
-    u8 io_rst;
+    u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);
 
 
Quoted 10 lines
Quoted 7 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
    /*  Reset 8051(WLMCU) IO wrapper */
    /*  0x1c[8] = 0 */
    /*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by

Lucas@20130624 */
-    io_rst = rtw_read8(padapter, REG_RSV_CTRL+1); io_rst &= ~BIT(0);
   rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);

I hate this.  It's a bad idea to put "code" in the declaration block.

Quoted 4 lines

Erick, you can look around in the output of the semantic patch and see if all of the ones with function calls are undesirable. If that’s the case you can post to the outreachy mailing list a revised semantic patch that doesn’t report on that case.

Thanks Julia I will look at it.

Quoted 20 lines

Julia

Quoted 16 lines
Quoted 7 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
    switch (type) {

   case TYPE_EFUSE_MAX_SECTION:
       {
-            u8 *pMax_section;
-            pMax_section = pOut;
+            u8 *pMax_section = pOut;

This is fine because "pOut" is a variable.  It doesn't have side effects
and it's not "code" in that sense.

regards,
dan carpenter

#12 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c

In reply to Dan Carpenter
Quoted 29 lines · Dan Carpenter
Quoted 28 lines · Erick Karanja

Optimize variable initialization by integrating the initialization directly into the variable declaration in cases where the initialization
is simple and doesn't depend on other variables or complex expressions.
This makes the code more concise and readable.

---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++---------
----

 1 file changed, 41 insertions(+), 114 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
index e15ec6452fd0..1e980b291e90 100644
@@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter,
 void *buffer, u32 size)
  void _8051Reset8723(struct adapter *padapter)
  {
  	u8 cpu_rst;
-	u8 io_rst;
+	u8 io_rst = rtw_read8(padapter, REG_RSV_CTRL + 1);



  /*  Reset 8051(WLMCU) IO wrapper */

Quoted 8 lines
Quoted 6 lines

  /*  0x1c[8] = 0 */
  /*  Suggested by Isaac@SD1 and Gimmy@SD1, coding by Lucas@20130624 */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
-	io_rst = rtw_read8(padapter, REG_RSV_CTRL+1);

  io_rst &= ~BIT(0); rtw_write8(padapter, REG_RSV_CTRL+1, io_rst);

I hate this.  It's a bad idea to put "code" in the declaration block.

Thank you on the review I believe updating the semantic patch to check for this could be great.

Quoted 16 lines

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c void Hal_GetEfuseDefinition( · line 502

Quoted 8 lines
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -0
@@ -501,8 +499,7 @@ void Hal_GetEfuseDefinition(
  	switch (type) {

  case TYPE_EFUSE_MAX_SECTION:
  {

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
-			u8 *pMax_section;
-			pMax_section = pOut;
+			u8 *pMax_section = pOut;

This is fine because "pOut" is a variable.  It doesn't have side effects
and it's not "code" in that sense.

regards,
dan carpenter