From nobody Sat Feb 7 17:55:43 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 9854D25D908 for ; Wed, 9 Apr 2025 10:04:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744193062; cv=none; b=MXBODSykjOOaNKiXDkv4m+s5lEPbnpUYBMn6NEietNqGsXioArPOw4isYMoQnQWQvwN1opZOe7wFdid4+eFL8OvMS5xTWRqs5ldbBMu89AahRS1ZkpmPib60lF3AbUA44umoQ53aOU3Fvb9lsuwLmobz2+BBFVq32L2IyFCkexc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744193062; c=relaxed/simple; bh=WnoJ0PIhBCizQsaB0J6OXZzdneIQzB5SWyb2HjwPjmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gMyFMD6LunJNLpmtgxfriegvh7oIDN8ymBkzO6Vrc4QYQpWY9PKJimLHOyYDW98VK47IvwY5hG3ynCrAKL84kF57mVls7pvMFICu1w4JFDYatTJKRWCvXTRVWuO+mTrWki336kA6N0p497Ot8Qh/C2m8yFCA1ziv6UBirbqea2M= 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=VOz1jvAM; arc=none smtp.client-ip=209.85.128.49 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="VOz1jvAM" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-43cf257158fso45975505e9.2 for ; Wed, 09 Apr 2025 03:04:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744193059; x=1744797859; 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=VC5fxHs8CeiwKADjawPGTUOJECA0Psky3GgKPj4Ekoc=; b=VOz1jvAMCBllzoElYeqspHv0qgo9KzTDgYL2V3EDpAYUFfOqpycWQ41STCaTTW0QgK V8O0v6zG0Sb2m26hxvdVK+N32TllAGg+mErypil6RaZ5+8hp+CzBTYRy2rVzpoiIg3JD X9Wq4J637mnv0An36PEW3zbfmdi1ndBtisQNz6HkejiLD3ABZKA7Wyjggc/2pruRQ5dk smwGU4tJS/FodgbkFdXmktTfmpNHC+oyMTN8m7/ZlkIuj1iZ6x5ceNHI9APZrRNCk1Be MgSsr6CgNTIresLSCAERdZDbMBUjqOSiGy8BreZIO0rlpiU9y3aikscZmk0qr8ASJ3EV wuSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744193059; x=1744797859; 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=VC5fxHs8CeiwKADjawPGTUOJECA0Psky3GgKPj4Ekoc=; b=mf/AkBzp8BCQScOtNWQkGdbqJudf7VnxjHUwsHe47DCLOcUEkFbzlQ263Sn5PjPUja Ql4edpuo3sjYKtTn0zh/HaNHdtUgLEyZaGRqsLKw3mvkEVr8TsSbctxbyA/ttwknfAO/ aSSRY7+Ip1DAIQ8uX3VRUL8s752TwDDmztRHxC8D876VRbGDVHcADEU8p+wiOh4DHNhu OOjNMiBTatbGtZGreQQEydPTXhUnnEJaVDEC3Pt+ngJoU9Zq/VZu/IWk4++1w76QV6EX CGnZNhIF8BdvkHQ9BZqI9U9EL3HUf4XhFLBw2OklUUU6vhMc1kwPq2Mce91sgA1Ql1TJ OTeQ== X-Forwarded-Encrypted: i=1; AJvYcCXGGPu7DhY/ClqxV0+gA+IkYZpDL2ZwUemA3zhZ0MY1m8945tg7+NHjlxATmE6MqLWJxoAuioAsM4iKivk=@vger.kernel.org X-Gm-Message-State: AOJu0YzB0ewg0UCrOroQ+KXekuxwOJY8jSY7vy54rUoHvlQDRH6kMK05 2jSH8NSgccucZ6zCDo6Y00NQZdtZpVnkkcRFQ9sccEvxB0TuXgQ1 X-Gm-Gg: ASbGncu/XZy87a4DeOohK4WGc2X+AHhPVhIvb+IfCjWcjuKXLDuw4aVe3tnIY1bq04D fK6lb0s27e8fxxC+FErsfEPI/XNsNe3tzjQwOl+BTQwoLWXPN3+vqOP/RVJvfTwpU2rsso8DRBq Mq83uuSeiscOQBdUc6IvlZXZp7G22Zw2URwqsjnwg4lgmjacFCbNDLdNqM/EV02NtlkSHvrw51b dj4/ILv6CXkHEgCiyygNXgTW9BzfGtYwEoFQ302p+BsCvgVjonqBjrEEHE/ebgtDoKgc1vRGvOr rDUIJSh2H4KtYTt79wG1of4Na7D8ncZiYNaMJA== X-Google-Smtp-Source: AGHT+IH0nKJUVbc50t7mTes5ovg4GgAkVaz1UTKljMjTHPB4yYKVLS/PxCuutuNL9VHzd7Cnpi+unQ== X-Received: by 2002:a05:600c:1f16:b0:43d:649:4e50 with SMTP id 5b1f17b1804b1-43f1fe01880mr18160855e9.13.1744193058483; Wed, 09 Apr 2025 03:04:18 -0700 (PDT) Received: from pc.. ([197.155.71.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f205ecac8sm14930295e9.4.2025.04.09.03.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 03:04:18 -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 v2 1/2] staging: rtl8723bs: Improve code readability Date: Wed, 9 Apr 2025 13:04:04 +0300 Message-ID: <97a2637f3ccefb3de0e15fd04f29f5f209f2a506.1744192642.git.karanja99erick@gmail.com> 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" Make the code more readable by moving trivial initializations up with the declarations instead of wasting a line on that. Signed-off-by: Erick Karanja Reviewed-by: Dan Carpenter --- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 84 ++++++------------- 1 file changed, 25 insertions(+), 59 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index e15ec6452fd0..2cf2c66140f1 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -501,8 +501,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 +512,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 +523,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 +534,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 +545,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 +556,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 +567,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 +578,7 @@ void Hal_GetEfuseDefinition( =20 default: { - u8 *pu1Tmp; - pu1Tmp =3D pOut; + u8 *pu1Tmp =3D pOut; *pu1Tmp =3D 0; } break; @@ -729,10 +721,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<securitypriv.dot11PrivacyAlgrthm; =20 - EncAlg =3D padapter->securitypriv.dot11PrivacyAlgrthm; switch (EncAlg) { case _NO_PRIVACY_: SET_TX_DESC_SEC_TYPE_8723B(pDesc, 0x0); @@ -2378,9 +2363,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 +2372,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,9 +2380,7 @@ static void hw_var_set_bssid(struct adapter *padapter= , 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)); @@ -2422,12 +2401,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 @@ -2543,15 +2518,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 */ @@ -2850,12 +2822,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 +3197,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 +3213,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 +3248,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 Sat Feb 7 17:55:43 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 B201F25DAE6 for ; Wed, 9 Apr 2025 10:04:26 +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=1744193069; cv=none; b=YJMOAV9Ey/eF92P/ISjdihoM0hWbqdtDVVK1Grl6blWK2+ZqOru22lgpCTkpy0y5jkXamHAo/BoTkG7dxoC32KNTJg9W7MJvY0Tt/w1JO1Awt1EloBnK9GNJ9xxmwUud9ELpLkgZWhRwMX4YG/I+Vie+Ugun6Q9Oe2T9NjsnsS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744193069; c=relaxed/simple; bh=Y7aoilTHEAEiwViUts1s9DCkd38iWetjcqoy20zyZOc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jId0eGg1sJv+aff3EkAHO4ALR5UyVElrUUx34BQoAeQE2Y5Rm/Lj+53HW+YcIIKovsjh+/AF9sKYT+k3LgbvXvDvlzXpxmA/7wC/Wt+gpJiFGr4N+5MKrys9MV90WB67+ov0iokVKkBvN5ojwAYk2ca2VLxhapK7U9D9ibqKS+o= 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=mxPqs94m; 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="mxPqs94m" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-39c1efc457bso3794196f8f.2 for ; Wed, 09 Apr 2025 03:04:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744193065; x=1744797865; 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=PCzI50zVqiA5SSz6j5vbBxTst8NskylefZbAbeCkJRs=; b=mxPqs94mLcPuJnLUT3U8lmm4NeAarEhPPMhPegkTwk23Z16R9DDHnuRwjXwH+vUdmD a5f56UJ1MRxpWJTNBHCfsXWvUzOaafRdibfyUXKCzC69KFVlsB2HAvNYW1JmWJEo5OHJ B18HgXDJtSBADGTmJaeaIm8+v6XYNVOCH9ebkMXMn6WIkzPbZlDew+WZYjT3GSuo1u2B mYcJLzC0SkpwJ1B5WGcWigR98qIqyXIu56eNsor3pYoAsn/wkuN+iaKvhL8c+K+pSrur C7JnFZpRT6Jam8kL1/lPhfcFZPlJpnWabeyqKwQOPMdKNftvZNCy1zxvwIM+YOB9USyi AcFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744193065; x=1744797865; 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=PCzI50zVqiA5SSz6j5vbBxTst8NskylefZbAbeCkJRs=; b=e4YFQLLk7XnRpzOf9zV9VtMuOeYp+nAAb1TxwuwHJGdfkaw6gdRI9re4kbX0j45j78 ptqSGSdIZ77As8dzcORAfcphXNItmS/u2IhyW3WWRHJ75hdT7jp30sCmut1jQjrn2aXv F/bebodZyyhv2Z3oG96LVizRteCdvzf3UiPMR8UQtasByygT/V8QSNnyZuDHnYUu7NVO brcYv1jJnRGmJ3rVrT3D4VXwZWedD+Y0lHoAavzrESJy+o4CYhSoufk/aR/CmNVLy1A5 wNv/AT3kb+8yRkSuzICGRb/4PZkeSxMU/sfW2PJQLaWN2DNh3v8fof6BPgErJip6Dv24 f5mQ== X-Forwarded-Encrypted: i=1; AJvYcCWin3AnLxs4dMmbayHiIkSdRCe7AtzZqZ4oEFDQYvpsMy45NK8QChfiraMphlZMpab34wRGvtao23EduRo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2YcoFgtTVfsgndro01+YO5wrATUg1xXsJGRSLFYAl37yDxTvE 2uNfoZtvCp9Azt3eOA3yZ1kC5OPhACfKzd/W0MQ6AfVgCV5OQfeM X-Gm-Gg: ASbGncvJvAK7WEdEdaytI0rFSNMkGFlLZ/eX6Srxn9evnPd4GJwf4I9PcgnwzKJpZwO VvHETCwcFRNx5xhTFca3rhh85hwymtKz5bCcDBVGkcVTx30+2giwDWLT3ardAbsZmltcsxvf0dL NxPZdRa3Jy7jEaWelv0DF+JeDdf18vd/rT67kYVKOCvySovuUOAIBgSnv/ZvNlaE90hqPzD97jx EDfH8tteM3ksxVIO6if6oOEgFhBtZXsNQEuEpBjmwxhLVO9GeR/1slNRsD0kpB2tYYuw8OvnKkR F0j1royCsNj5/QQDdkTlQvI1sQWtCDGc6hZZfg== X-Google-Smtp-Source: AGHT+IFeZKOFYB4CHU5SWnQx8exXAGvWWy5DD7UqI5Mdd/V8928schjgyY2lbkhbslyWyFRJVJ6G+g== X-Received: by 2002:a05:6000:402c:b0:39c:12ce:67e with SMTP id ffacd0b85a97d-39d8855a42fmr1668006f8f.41.1744193064904; Wed, 09 Apr 2025 03:04:24 -0700 (PDT) Received: from pc.. ([197.155.71.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f205ecac8sm14930295e9.4.2025.04.09.03.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 03:04:23 -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 v2 2/2] staging: rtl8723bs: Initializing variables at declaration Date: Wed, 9 Apr 2025 13:04:05 +0300 Message-ID: <0fb58ca930030af2a4c730b0f5328e64210b795b.1744192642.git.karanja99erick@gmail.com> 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" Make the code more readable by moving trivial initializations up with the declarations instead of wasting a line on that. Signed-off-by: Erick Karanja --- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 39 ++++++------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index 5dc1c12fe03e..d134d185bfae 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__); @@ -242,8 +239,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, st= ruct xmit_priv *pxmitpriv /* pxmitbuf->priv_data will be NULL, and will crash here */ if (pxmitbuf->len > 0 && pxmitbuf->priv_data) { - struct xmit_frame *pframe; - pframe =3D (struct xmit_frame *)pxmitbuf->priv_data; + struct xmit_frame *pframe =3D (struct xmit_frame *)pxmitbuf->priv_d= ata; pframe->agg_num =3D k; pxmitbuf->agg_num =3D k; rtl8723b_update_txdesc(pframe, pframe->buf_addr); @@ -326,8 +322,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 +352,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 +400,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 +423,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; @@ -557,15 +542,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 __queue *pqueue =3D &pxmitpriv->pending_xmitbuf_queue; struct list_head *plist, *phead; 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 --=20 2.43.0