From nobody Wed Feb 11 04:18:11 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97630224D7 for ; Sat, 5 Apr 2025 03:15:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743822933; cv=none; b=bBRN7E4gbuDgzc4lj85Jt6iTYuu/magXJFgZ2vI+wHEMrTOTfZOcS+NBQQR0LAjJKVAEVa2VaKDh33PhO8Z/rMUFlIvM+9NlYUjMr2t7nNjZzE+i7LrLMLnSMJkOa/coefTxgSq8YXt34ng/CMlorS2qzrhgYsOF025/qTbxIhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743822933; c=relaxed/simple; bh=DqkfnTvGY3dikIK5RXyBzB0lRrPjLMI23G+Tn5C5GA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d7i79Ho14w+bf0HRCpXjWkrLS3ob1qWZGThVo1JAujhvXFqRXbt3dHDy55rSMLK+vPsVCBKvltbM4wgtu9O7gtyRmPpa/aoN7w1CS/W/my7qFfh9r9TBkitqPA6Ju3ysZvhUX7irC3sk1ytN1K5As8jvf2bh0t9PmBKH3Qc3CHQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IkDNiZBO; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IkDNiZBO" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-39ac56756f6so2166609f8f.2 for ; Fri, 04 Apr 2025 20:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743822930; x=1744427730; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FkfZ0gGwuC9nrH0UyIrZgSM/LrDfC8j2fxcG7p/eqyM=; b=IkDNiZBOXRX/PHVJ8gT8Ms3dyyHAADyfOAjQFmblrkWsH5c2ruPoG7Kji41w6wBYUS 3xRFv9f5P8DyJUN/JbsMPTQabMbS1jwKxc49lPU4bcNUrAjZ8mSM2i/ohg3IFNWxKyvP 3d1y7eSeVmFyb57ayjqR2DQ3xz/UqA5BSaewMkH4bt9SVq7XHysc6XxxhR2Ou1aLe95q cz1ZOE/Cm58dx8+xl0X7mGkeDR1y8NPp2QaFq4LHOrwxCMTbDlhq/aV+ktJll8BNLyOi XOIjkmOrdzXWaaDpJSUQxkqLveSoKT095oEY2hfmlqg4Ve1iLSAFdnyLz4WIdSanuLqb tVnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743822930; x=1744427730; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FkfZ0gGwuC9nrH0UyIrZgSM/LrDfC8j2fxcG7p/eqyM=; b=jv5v7TT7FmU/5R0znKaqyH69JuWDxdeqQhRoqXYIP6bknGEOLTXH7ivun4vxSkelwv 7AvuShkbdUyUZJFt39js3jmCIKqZST9y+ot1hyCWyNNKTpZIfrLiYdM0uAaRWLusGs/Y gpZqxSAuFlH5+SdddOQ2Jq/LmSIxuushy2TOw7e6FGUAhvKlDx5RH+BIyx+sTWGI1jGL fxOidbT/7jB6wBFpV/to6Aj3TRfTHei+6SXbA3EIcDp1aJ7HYC25zzJGY6dAviylpBC+ vLErLTW0NHCRSSIVEERz86jTwGLAHn5sElzv2V2BdF9BVcYo8qyVbKqEJYy9DLfgmeLS mK0A== X-Forwarded-Encrypted: i=1; AJvYcCW4EOqrDZKw31W68MHa8/ueUlVb/1LlkGxdwVINiuPbpJCLBxQMhKn8N9yKtHfQQgslAq3gmHQighiMyYc=@vger.kernel.org X-Gm-Message-State: AOJu0YzQgekMrx4avfVulhLff/nS1IxlR5uLcWpTBwaLvWq8W+uwif1Z USo1YCfcesxb3czFXb8OWTovbnp5/BZ9pR158k7aRyePkbKjmVTT X-Gm-Gg: ASbGncs9Wisk3gDIYLkLGutzZNGy3Qfr13O5I02draHj8aRtuCjKcBPg0ZmuWJVX6NQ rULLdm9o7nBZ8KALvvPfIb0txBv4eFeCAF4zBYX5vdcibmihIB4XRMRq818Lx5+FZtpsho1yjDb /E9LJARYcnqlTVqRB36l0mNRgWyd4koUUhkgabI1Yrg0AEs6mHoS53XGbY6fjBH+HkUfAGCd7K5 Iq+z9MtGFlBzOcIqPiKCp8S4IILRoyQoElDKshdZH4MejZkzA4BtADnNbxs7K6nXqVtuz5FP4ZQ oK57jZ8BUUjExwxc0Xu6IORU0sjpuCUNU0V7xT9FMji1KIH2d+lr X-Google-Smtp-Source: AGHT+IGYaJeqkHE71ISzt7wJyM7edL7dK9X0c2f4W4Zz+pR/RA7K/xFBMwyGm+IBnQlGXrpqSpFQgg== X-Received: by 2002:a5d:584a:0:b0:39c:dcc:fa29 with SMTP id ffacd0b85a97d-39cba932a65mr4847133f8f.17.1743822929566; Fri, 04 Apr 2025 20:15:29 -0700 (PDT) Received: from pc.. ([197.232.62.187]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020d6b1sm5832250f8f.62.2025.04.04.20.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Apr 2025 20:15:28 -0700 (PDT) From: Erick Karanja To: gregkh@linuxfoundation.org, outreachy@lists.linux.dev Cc: karanja99erick@gmail.com, philipp.g.hortmann@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: rtl8723bs: Optimize variable initialization in rtl8723b_hal_init.c Date: Sat, 5 Apr 2025 06:14:48 +0300 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Erick Karanja --- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +++++------------- 1 file changed, 41 insertions(+), 114 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index e15ec6452fd0..1e980b291e90 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -152,13 +152,12 @@ static int _WriteFW(struct adapter *padapter, void *b= uffer, u32 size) void _8051Reset8723(struct adapter *padapter) { u8 cpu_rst; - u8 io_rst; + u8 io_rst =3D rtw_read8(padapter, REG_RSV_CTRL + 1); =20 =20 /* Reset 8051(WLMCU) IO wrapper */ /* 0x1c[8] =3D 0 */ /* Suggested by Isaac@SD1 and Gimmy@SD1, coding by Lucas@20130624 */ - io_rst =3D rtw_read8(padapter, REG_RSV_CTRL+1); io_rst &=3D ~BIT(0); rtw_write8(padapter, REG_RSV_CTRL+1, io_rst); =20 @@ -218,11 +217,10 @@ u8 g_fwdl_wintint_rdy_fail; static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_m= s) { s32 ret =3D _FAIL; - u32 value32; + u32 value32 =3D rtw_read32(adapter, REG_MCUFWDL); unsigned long start =3D jiffies; u32 cnt =3D 0; =20 - value32 =3D rtw_read32(adapter, REG_MCUFWDL); value32 |=3D MCUFWDL_RDY; value32 &=3D ~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 =3D pOut; + u8 *pMax_section =3D pOut; =20 if (efuseType =3D=3D EFUSE_WIFI) *pMax_section =3D EFUSE_MAX_SECTION_8723B; @@ -513,8 +510,7 @@ void Hal_GetEfuseDefinition( =20 case TYPE_EFUSE_REAL_CONTENT_LEN: { - u16 *pu2Tmp; - pu2Tmp =3D pOut; + u16 *pu2Tmp =3D pOut; =20 if (efuseType =3D=3D EFUSE_WIFI) *pu2Tmp =3D EFUSE_REAL_CONTENT_LEN_8723B; @@ -525,8 +521,7 @@ void Hal_GetEfuseDefinition( =20 case TYPE_AVAILABLE_EFUSE_BYTES_BANK: { - u16 *pu2Tmp; - pu2Tmp =3D pOut; + u16 *pu2Tmp =3D pOut; =20 if (efuseType =3D=3D EFUSE_WIFI) *pu2Tmp =3D (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES); @@ -537,8 +532,7 @@ void Hal_GetEfuseDefinition( =20 case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL: { - u16 *pu2Tmp; - pu2Tmp =3D pOut; + u16 *pu2Tmp =3D pOut; =20 if (efuseType =3D=3D EFUSE_WIFI) *pu2Tmp =3D (EFUSE_REAL_CONTENT_LEN_8723B-EFUSE_OOB_PROTECT_BYTES); @@ -549,8 +543,7 @@ void Hal_GetEfuseDefinition( =20 case TYPE_EFUSE_MAP_LEN: { - u16 *pu2Tmp; - pu2Tmp =3D pOut; + u16 *pu2Tmp =3D pOut; =20 if (efuseType =3D=3D EFUSE_WIFI) *pu2Tmp =3D EFUSE_MAX_MAP_LEN; @@ -561,8 +554,7 @@ void Hal_GetEfuseDefinition( =20 case TYPE_EFUSE_PROTECT_BYTES_BANK: { - u8 *pu1Tmp; - pu1Tmp =3D pOut; + u8 *pu1Tmp =3D pOut; =20 if (efuseType =3D=3D EFUSE_WIFI) *pu1Tmp =3D EFUSE_OOB_PROTECT_BYTES; @@ -573,8 +565,7 @@ void Hal_GetEfuseDefinition( =20 case TYPE_EFUSE_CONTENT_LEN_BANK: { - u16 *pu2Tmp; - pu2Tmp =3D pOut; + u16 *pu2Tmp =3D pOut; =20 if (efuseType =3D=3D EFUSE_WIFI) *pu2Tmp =3D EFUSE_REAL_CONTENT_LEN_8723B; @@ -585,8 +576,7 @@ void Hal_GetEfuseDefinition( =20 default: { - u8 *pu1Tmp; - pu1Tmp =3D pOut; + u8 *pu1Tmp =3D pOut; *pu1Tmp =3D 0; } break; @@ -729,10 +719,9 @@ static void hal_ReadEFuse_WiFi( } =20 if (offset < EFUSE_MAX_SECTION_8723B) { - u16 addr; + u16 addr =3D offset * PGPKT_DATA_SIZE; /* Get word enable value from PG header */ =20 - addr =3D offset * PGPKT_DATA_SIZE; for (i =3D 0; i < EFUSE_MAX_WORD_UNIT; i++) { /* Check word enable condition in the section */ if (!(wden & (0x01<mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &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 =3D REG_BCN_CTRL; + u32 bcn_ctrl_reg =3D REG_BCN_CTRL; =20 /* */ /* ATIM window */ @@ -1416,9 +1384,7 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) =20 void rtl8723b_InitAntenna_Selection(struct adapter *padapter) { - u8 val; - - val =3D rtw_read8(padapter, REG_LEDCFG2); + u8 val =3D rtw_read8(padapter, REG_LEDCFG2); /* Let 8051 take control antenna setting */ val |=3D BIT(7); /* DPDT_SEL_EN, 0x4C[23] */ rtw_write8(padapter, REG_LEDCFG2, val); @@ -1426,14 +1392,10 @@ void rtl8723b_InitAntenna_Selection(struct adapter = *padapter) =20 void rtl8723b_init_default_value(struct adapter *padapter) { - struct hal_com_data *pHalData; - struct dm_priv *pdmpriv; + struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); + struct dm_priv *pdmpriv =3D &pHalData->dmpriv; u8 i; =20 - - pHalData =3D GET_HAL_DATA(padapter); - pdmpriv =3D &pHalData->dmpriv; - padapter->registrypriv.wireless_mode =3D WIRELESS_11BG_24N; =20 /* init default value */ @@ -1478,9 +1440,7 @@ void rtl8723b_init_default_value(struct adapter *pada= pter) u8 GetEEPROMSize8723B(struct adapter *padapter) { u8 size =3D 0; - u32 cr; - - cr =3D rtw_read16(padapter, REG_9346CR); + u32 cr =3D rtw_read16(padapter, REG_9346CR); /* 6: EEPROM used is 93C46, 4: boot from E-Fuse. */ size =3D (cr & BOOT_FROM_EEPROM) ? 6 : 4; =20 @@ -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 =3D _FAIL; + u32 val32 =3D rtw_read32(padapter, REG_AUTO_LLT); + s32 ret =3D _FAIL; =20 - val32 =3D rtw_read32(padapter, REG_AUTO_LLT); val32 |=3D BIT_AUTO_INIT_LLT; rtw_write32(padapter, REG_AUTO_LLT, val32); =20 @@ -1559,11 +1515,10 @@ void Hal_EfuseParseIDCode(struct adapter *padapter,= u8 *hwinfo) { struct eeprom_priv *pEEPROM =3D GET_EEPROM_EFUSE_PRIV(padapter); /* struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); */ - u16 EEPROMId; + u16 EEPROMId =3D le16_to_cpu(*((__le16 *)hwinfo)); =20 =20 /* Check 0x8129 again for making sure autoload status!! */ - EEPROMId =3D le16_to_cpu(*((__le16 *)hwinfo)); if (EEPROMId !=3D RTL_EEPROM_ID) { pEEPROM->bautoload_fail_flag =3D true; } else @@ -2273,9 +2228,8 @@ void rtl8723b_fill_fake_txdesc( /* Encrypt the data frame if under security mode excepct null data. Sugg= ested by CCW. */ /* */ if (bDataFrame) { - u32 EncAlg; + u32 EncAlg =3D padapter->securitypriv.dot11PrivacyAlgrthm; =20 - EncAlg =3D 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 *padapte= r, u8 variable, u8 *val) static void hw_var_set_macaddr(struct adapter *padapter, u8 variable, u8 *= val) { u8 idx =3D 0; - u32 reg_macid; - - reg_macid =3D REG_MACID; + u32 reg_macid =3D REG_MACID; =20 for (idx =3D 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 *padapt= er, u8 variable, u8 *val) static void hw_var_set_bssid(struct adapter *padapter, u8 variable, u8 *va= l) { u8 idx =3D 0; - u32 reg_bssid; - - reg_bssid =3D REG_BSSID; + u32 reg_bssid =3D REG_BSSID; =20 for (idx =3D 0 ; idx < 6; idx++) rtw_write8(padapter, (reg_bssid+idx), val[idx]); @@ -2399,15 +2349,12 @@ static void hw_var_set_bssid(struct adapter *padapt= er, u8 variable, u8 *val) =20 static void hw_var_set_bcn_func(struct adapter *padapter, u8 variable, u8 = *val) { - u32 bcn_ctrl_reg; - - bcn_ctrl_reg =3D REG_BCN_CTRL; + u32 bcn_ctrl_reg =3D REG_BCN_CTRL; =20 if (*(u8 *)val) rtw_write8(padapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT)); else { - u8 val8; - val8 =3D rtw_read8(padapter, bcn_ctrl_reg); + u8 val8 =3D rtw_read8(padapter, bcn_ctrl_reg); val8 &=3D ~(EN_BCN_FUNCTION | EN_TXBCN_RPT); =20 /* Always enable port0 beacon function for PSTDMA */ @@ -2422,12 +2369,8 @@ static void hw_var_set_correct_tsf(struct adapter *p= adapter, u8 variable, u8 *va { u8 val8; u64 tsf; - struct mlme_ext_priv *pmlmeext; - struct mlme_ext_info *pmlmeinfo; - - - pmlmeext =3D &padapter->mlmeextpriv; - pmlmeinfo =3D &pmlmeext->mlmext_info; + struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; + struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 tsf =3D pmlmeext->TSFValue-do_div(pmlmeext->TSFValue, (pmlmeinfo->bcn_int= erval*1024))-1024; /* us */ =20 @@ -2479,17 +2422,11 @@ static void hw_var_set_mlme_disconnect(struct adapt= er *padapter, u8 variable, u8 =20 static void hw_var_set_mlme_sitesurvey(struct adapter *padapter, u8 variab= le, u8 *val) { - u32 value_rcr, rcr_clear_bit, reg_bcn_ctl; + u32 value_rcr, rcr_clear_bit, reg_bcn_ctl =3D REG_BCN_CTRL; u16 value_rxfltmap2; u8 val8; - struct hal_com_data *pHalData; - struct mlme_priv *pmlmepriv; - - - pHalData =3D GET_HAL_DATA(padapter); - pmlmepriv =3D &padapter->mlmepriv; - - reg_bcn_ctl =3D REG_BCN_CTRL; + struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 rcr_clear_bit =3D RCR_CBSSID_BCN; =20 @@ -2543,15 +2480,12 @@ static void hw_var_set_mlme_join(struct adapter *pa= dapter, u8 variable, u8 *val) u8 val8; u16 val16; u32 val32; - u8 RetryLimit; - u8 type; - struct mlme_priv *pmlmepriv; + u8 RetryLimit =3D 0x30; + u8 type =3D *(u8 *)val; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct eeprom_priv *pEEPROM; =20 =20 - RetryLimit =3D 0x30; - type =3D *(u8 *)val; - pmlmepriv =3D &padapter->mlmepriv; pEEPROM =3D GET_EEPROM_EFUSE_PRIV(padapter); =20 if (type =3D=3D 0) { /* prepare to join */ @@ -2779,8 +2713,7 @@ void SetHwReg8723B(struct adapter *padapter, u8 varia= ble, u8 *val) =20 case HW_VAR_CHECK_BSSID: { - u32 val32; - val32 =3D rtw_read32(padapter, REG_RCR); + u32 val32 =3D rtw_read32(padapter, REG_RCR); if (*val) val32 |=3D RCR_CBSSID_DATA|RCR_CBSSID_BCN; else @@ -2850,12 +2783,11 @@ void SetHwReg8723B(struct adapter *padapter, u8 var= iable, u8 *val) =20 case HW_VAR_ACK_PREAMBLE: { - u8 regTmp; + u8 regTmp =3D 0; u8 bShortPreamble =3D *val; =20 /* Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporaril= y) */ /* regTmp =3D (pHalData->nCur40MhzPrimeSC)<<5; */ - regTmp =3D 0; if (bShortPreamble) regTmp |=3D 0x80; rtw_write8(padapter, REG_RRSR+2, regTmp); @@ -3226,9 +3158,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 varia= ble, u8 *val) */ u8 SetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable varia= ble, void *pval) { - u8 bResult; - - bResult =3D _SUCCESS; + u8 bResult =3D _SUCCESS; =20 switch (variable) { default: @@ -3244,9 +3174,7 @@ u8 SetHalDefVar8723B(struct adapter *padapter, enum h= al_def_variable variable, v */ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable varia= ble, void *pval) { - u8 bResult; - - bResult =3D _SUCCESS; + u8 bResult =3D _SUCCESS; =20 switch (variable) { case HAL_DEF_MAX_RECVBUF_SZ: @@ -3281,9 +3209,8 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum h= al_def_variable variable, v case HW_DEF_RA_INFO_DUMP: { u8 mac_id =3D *(u8 *)pval; - u32 cmd; + u32 cmd =3D 0x40000100 | mac_id; =20 - cmd =3D 0x40000100 | mac_id; rtw_write32(padapter, REG_HMEBOX_DBG_2_8723B, cmd); msleep(10); rtw_read32(padapter, 0x2F0); // info 1 --=20 2.43.0 From nobody Wed Feb 11 04:18:11 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 119B33209 for ; Sat, 5 Apr 2025 03:15:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743822949; cv=none; b=uXPDUAyVlynw76HNAsH9L3l7ZJS77z7xSR4HXcU5sFyItsEzhgIgU8Zx2j/tJuUbnsexYGWPG+p8yFJQfsPTueP24bBmN7gSxvvIkZrmEkoHvHJVtYLi8dxZb7ACO1nyVm0hnl+9dxugVhbnBmzwH+fnbbp8MODDAhqAZWN/jyQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743822949; c=relaxed/simple; bh=6wmuQ4xBJ/p57V3uZMiwB+aak9YwDuZCThNZhURf6Lw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KRBEihQY6o3WQi5QJ3s7cAJpk1+Dq6OxjOgf3AIJsP0hErCUYXPmenKqup0mavZk9uReBPSql5/1gQ/IJo1vkOsIO2X0I0G8bVxYD+0sXZnunw3Y5athe+QMh6JoupkZtsTu0N4aHn4EPMPNhXwWSqwHsMpn5FDPuzhuiS+TG1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ln3jk1vB; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ln3jk1vB" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so25373745e9.1 for ; Fri, 04 Apr 2025 20:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743822946; x=1744427746; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7kj8e5KMlBOp/DQsu01vidRr3nQ+UO1HZ+C4LyVGDRs=; b=Ln3jk1vBSsg4HGmqG0evlQevo99lU6xqfUhRan3t1aDQjcdzrhpxSqT99HLWRk4vLm 6E0N+YKMjdgMsL3Ct1uytUYnWkbPL0ZYmw184J9DCKT3GqFeEtvm7Mia4uS1hDHVm4qF r72ZPx4ntInD5T8HjuYQk+XNVbXNhJxodrcGJb9X8oOw33ib0wHP+vqu2dSKaHzxOHzu EDqhg0C15hBD82ZJqIGGIc8shDXoMjUkI7W0mT3VuAw3wTsORmVo4vS65mYyJMwIXpBp 5nh/22bHDrfAIBpUlC1PFUX3NahrsIyten4tpnl6AeR0HwV3aW6vWyU+9DahBw/5KrGl QQaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743822946; x=1744427746; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7kj8e5KMlBOp/DQsu01vidRr3nQ+UO1HZ+C4LyVGDRs=; b=Z7EieyC6l287rWFnyBo0P5Zi8Bivk0tRJrMPEvc3Awh578l6DFCm2L8zajKbf6S73a rca0ZLz6e+dN6F1y5mey4wnasfUtPcYTGrUrc4fuPaVMLsq4l3gR5XEzD2+8OsBd6f+x Eg4cTlC2xKgPdvqaSbcvY/Fsbd+MoByUX3PfjQBZp24okwiYYMEbtnkMHLbW+l53g1aL BvPc+ZG3yZtAzFvqXr6GjzoCtU+W0gINU5uWE7rMRdKHBpXaBW6G+nAGGAJjyiqVJGNc e0jivIUYedGJ/HmS3+1fgMPY9n/8a25A8POAfDGYy6AKM4M7cIbq1xqCMCY+nlBl+t0W qEDw== X-Forwarded-Encrypted: i=1; AJvYcCX6N+LEgYjg3NkPRT1TkePn+CwN5DFkTX99HEqiKzvRpkRou/Xo4/4JkTp/+q+RdGiWGLxTTtGXE0OS1iY=@vger.kernel.org X-Gm-Message-State: AOJu0YxfvBLceJWDa5+umhg5cZvtNO2+Quied4x37jt1DhZ36PJlkRqd bc8S+yAgrRh/G/kdCGSRoSKYF901VJDHTN+0Q3ZhkEZ3g3LF/IZo X-Gm-Gg: ASbGnctDU913oRMhiJ9eGonldqY7jgCiBgL3vhAvLbutb3/YaTq/DhI613OPZuJyv7k 7GzRuvgb6iPEOyMsSeatY5vHqePkZ1YL8WQ3UlGYxiDEsUu6rgh6RYFByOXCoF3EHqF/SPZ+Juu jbLLV7DDM7SsOEtknd+F6PAJ2paNKnhbHyI5+vhHO2ytCE/FqbnR0yCfIDRmbgiddk5kWPDE1Jq pQ3ECezoEYVNdpsaj3Rtvk6Shn6yDA0D5uAeOJiId3hGUgvIaP5khBjBxe1/buidrtMLKFn5b2O Ft70NRww8g4wkusoXPPc0rUeQk7UiGfhuG+0WSFjAg== X-Google-Smtp-Source: AGHT+IHJCATuG4/WZlGUnW1DnDSoYaiXP9qbuSMdrAgwY3BMnLvXxrbFycKulef+WVuzh5gLgvnffQ== X-Received: by 2002:a05:600c:1991:b0:43c:f509:2bbf with SMTP id 5b1f17b1804b1-43ebefb7f50mr98457175e9.15.1743822946094; Fri, 04 Apr 2025 20:15:46 -0700 (PDT) Received: from pc.. ([197.232.62.187]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020d6b1sm5832250f8f.62.2025.04.04.20.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Apr 2025 20:15:44 -0700 (PDT) From: Erick Karanja To: gregkh@linuxfoundation.org, outreachy@lists.linux.dev Cc: karanja99erick@gmail.com, philipp.g.hortmann@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: rtl8723bs: Initialize local variables at declaration Date: Sat, 5 Apr 2025 06:14:49 +0300 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Erick Karanja --- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 56 ++++++------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index 5dc1c12fe03e..ebe9562a9606 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -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 =3D &padapter->xmitpriv; u8 queue_empty, queue_pending; s32 ret; =20 - - pxmitpriv =3D &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 *padapt= er) */ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxm= itpriv) { - s32 err, ret; + s32 err =3D 0, ret; u32 k =3D 0; - struct hw_xmit *hwxmits, *phwxmit; - u8 idx, hwentry; + struct hw_xmit *hwxmits =3D pxmitpriv->hwxmits, *phwxmit; + u8 idx, hwentry =3D 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, st= ruct xmit_priv *pxmitpriv u8 txdesc_size =3D TXDESC_SIZE; int inx[4]; =20 - err =3D 0; - hwxmits =3D pxmitpriv->hwxmits; - hwentry =3D pxmitpriv->hwxmit_entry; ptxservq =3D NULL; pxmitframe =3D NULL; pframe_queue =3D NULL; @@ -326,8 +320,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, st= ruct xmit_priv *pxmitpriv /* dump xmit_buf to hw tx fifo */ if (pxmitbuf) { if (pxmitbuf->len > 0) { - struct xmit_frame *pframe; - pframe =3D (struct xmit_frame *)pxmitbuf->priv_data; + struct xmit_frame *pframe =3D (struct xmit_frame *)pxmitbuf->priv_data; pframe->agg_num =3D k; pxmitbuf->agg_num =3D k; rtl8723b_update_txdesc(pframe, pframe->buf_addr); @@ -357,12 +350,9 @@ static s32 xmit_xmitframes(struct adapter *padapter, s= truct xmit_priv *pxmitpriv */ static s32 rtl8723bs_xmit_handler(struct adapter *padapter) { - struct xmit_priv *pxmitpriv; + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; s32 ret; =20 - - pxmitpriv =3D &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 *pada= pter) =20 int rtl8723bs_xmit_thread(void *context) { - s32 ret; - struct adapter *padapter; - struct xmit_priv *pxmitpriv; - - ret =3D _SUCCESS; - padapter =3D context; - pxmitpriv =3D &padapter->xmitpriv; + s32 ret =3D _SUCCESS; + struct adapter *padapter =3D context; + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; =20 allow_signal(SIGTERM); =20 @@ -435,16 +421,13 @@ s32 rtl8723bs_mgnt_xmit( ) { s32 ret =3D _SUCCESS; - struct pkt_attrib *pattrib; - struct xmit_buf *pxmitbuf; + struct pkt_attrib *pattrib =3D &pmgntframe->attrib; + struct xmit_buf *pxmitbuf =3D pmgntframe->pxmitbuf; struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; struct dvobj_priv *pdvobjpriv =3D adapter_to_dvobj(padapter); u8 *pframe =3D (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; u8 txdesc_size =3D TXDESC_SIZE; =20 - pattrib =3D &pmgntframe->attrib; - pxmitbuf =3D pmgntframe->pxmitbuf; - rtl8723b_update_txdesc(pmgntframe, pmgntframe->buf_addr); =20 pxmitbuf->len =3D txdesc_size + pattrib->last_txcmdsz; @@ -519,9 +502,8 @@ s32 rtl8723bs_hal_xmitframe_enqueue( ) { struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; - s32 err; + s32 err =3D rtw_xmitframe_enqueue(padapter, pxmitframe); =20 - err =3D rtw_xmitframe_enqueue(padapter, pxmitframe); if (err !=3D _SUCCESS) { rtw_free_xmitframe(pxmitpriv, pxmitframe); =20 @@ -543,10 +525,7 @@ s32 rtl8723bs_hal_xmitframe_enqueue( s32 rtl8723bs_init_xmit_priv(struct adapter *padapter) { struct xmit_priv *xmitpriv =3D &padapter->xmitpriv; - struct hal_com_data *phal; - - - phal =3D GET_HAL_DATA(padapter); + struct hal_com_data *phal =3D GET_HAL_DATA(padapter); =20 spin_lock_init(&phal->SdioTxFIFOFreePageLock); init_completion(&xmitpriv->SdioXmitStart); @@ -557,16 +536,13 @@ s32 rtl8723bs_init_xmit_priv(struct adapter *padapter) =20 void rtl8723bs_free_xmit_priv(struct adapter *padapter) { - struct xmit_priv *pxmitpriv; + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; struct xmit_buf *pxmitbuf; - struct __queue *pqueue; - struct list_head *plist, *phead; + struct __queue *pqueue =3D &pxmitpriv->pending_xmitbuf_queue; + struct list_head *plist, *phead =3D get_list_head(pqueue); struct list_head tmplist; =20 =20 - pxmitpriv =3D &padapter->xmitpriv; - pqueue =3D &pxmitpriv->pending_xmitbuf_queue; - phead =3D get_list_head(pqueue); INIT_LIST_HEAD(&tmplist); =20 spin_lock_bh(&pqueue->lock); --=20 2.43.0