From nobody Tue Dec 16 08:39:18 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 244AA20766D for ; Thu, 10 Apr 2025 07:12:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744269126; cv=none; b=j6uhMxVdrdmY17ltsGM/868R9dzIUTFQ2bxgmJ1hHpjSfrLobK2VDGNg62K2BfE7hCSLgjhOfHIqhfG2nj3AtuIC9DR7D6YCEBxB3zwFReFCwdcHBYHUNfxSnRkf5n3mt4ol4T9c5bt2u/SXOSrIOZAwW1hK+PzkQFSu5fI2VU4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744269126; c=relaxed/simple; bh=/5Jabjf2/VwLZmbye4C45Q8fKwbVmZpw1ehJK3tUXHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eJlkJdtpczVv1ib0WG8dXn+kg4LItJlaWQKp521mcVtb7BC9hV8kNmPLeLBhG2lxWiMNGLcmzVStjISd7lZzOS4Za1cqEum8/Q3kpYkJ3hEnP247PeABTaVm8/96jbCyV15r6pwf/zRaudGQeOm/aIUdrAmVMB4TBkP9f3g2aF0= 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=Olv1nyDU; arc=none smtp.client-ip=209.85.128.50 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="Olv1nyDU" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso3342835e9.3 for ; Thu, 10 Apr 2025 00:12:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744269123; x=1744873923; 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=r/kImcHus6K8wzdBbiGWobUyEVK/5YlVtUxGYAzt1sU=; b=Olv1nyDUw0BmsZcizsLo2DYVj3gYJDt0R9GBersD0RS30LFxvFF+7hTGNsBlefMOl+ XLpqZqxQr+Tj+6WniRHtfNxVYtcb3rUWT1WersZ0tPsTZD3HnZufM9d2kVwtVZh1PvpU VZqnGiJ5jt4XyUVP3pprN7v5vGSJdToo3IRpAKxAtdxQYkuyo0dNRLk7PqHZaJB5jMLO tjwaOjHL8P0qCMelt8AMgoV6Q8KOCHIAtdjdILrTTAGBiYou8aTtHBZG+hBQrPXhqlL4 l8gibaK+/N4bqKevuPRt+aqeTYrXMnOpdig3oRYPhCV+EBPtNZXq266OA+V/S5gDANDN c3vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744269123; x=1744873923; 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=r/kImcHus6K8wzdBbiGWobUyEVK/5YlVtUxGYAzt1sU=; b=Owc4tGNy3Y9dDSXkdKMCg3lsQfn/OYyOZwBxWAzGJNoSTYIk/3xId2Q6ipg0g/Br+M Pw0BdEGvopoR2On2U3XhzTpYZxwLthbqRsfx8ELrqNWfIRKHEmjWLtUsz/ajbXKU/Uj+ 79tiwmyT6/Y00Y7Ds9klrHzsphIpeQgDsWRBKtcRyiXZ/478qGKfHfPSQvbA+POFmQKU PXSDxmp+ZhPOh99iSSJ4F+hRuz3+0bn2NlyMA+zYZJ4pAszLqlBYAjGUdHighuOsDnTx tgDM+nJ/JIj0uvLWkvL70yCSXYkU3P3Hl4aw+9zXuDZIhyEsh8FDvd40btQ7hZUSTnXF fnqw== X-Forwarded-Encrypted: i=1; AJvYcCXdYwEI/yEQz1765VVJHC8dWXMXf4t5zyZ86PYHXtImXfXBhKiVHYKk4eOvbJzQueTJY+XzbR1awOkCQnk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/tZMJONBCfTAAPwvtDh/3EYyiy9jJp/SgGsAIVZ16Z0883ViL RAkBLTCHWrg1KOYi7W2gPuN7/W7jTr4+M2LHDe6dA0FPcs8+r2qH X-Gm-Gg: ASbGnctoWmyQkbausSVHzyHdCtWh3vpmiG9ikGCmLCtOHJTQ621HyJQEEc2Dtrt1NUd kZfz5rxZqRhC4mDEiQ54/cUScixfTqXuZ2POgqLCIGJF/P5mDq0DaIuI0/svgpUokP67Yp/Ecsq mpgwOfsd0hyfTS2hYNUXOBAMSh5BeTKlXDtGNq1xOFBVzMi21R2KgSfGYGCq5/JK22KTvnhZAmJ 5Wd6yHS+RhP75VMLZW8zc8eHPYom5IoRXQoaEavw1DvQsZMzmdPHI9MVADgDnmYp4rL0tlJDB2y 4bwT3GcrZqUgzagcNxz9PJtUISeCt/GiQybasg== X-Google-Smtp-Source: AGHT+IGUjWy5+GCs4lfK0gJgBU45n/jQLhkWrXhfLZ0eHcJXduI2FPHwhAfMdNh2iZjfetiYKjIHMA== X-Received: by 2002:a05:600c:524c:b0:43f:2bbf:c228 with SMTP id 5b1f17b1804b1-43f2d959427mr13343395e9.22.1744269123184; Thu, 10 Apr 2025 00:12:03 -0700 (PDT) Received: from pc.. ([197.155.71.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f235a5e90sm40831765e9.38.2025.04.10.00.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 00:12:01 -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 v3 1/2] staging: rtl8723bs: Initialize variables at declaration in rtl8723bs_xmit.c Date: Thu, 10 Apr 2025 10:11:50 +0300 Message-ID: <0a2165d8135d2b4de6b9c05fdc56fe5d7408e7c8.1744268316.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 | 33 +++++-------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index 5dc1c12fe03e..842e19b53421 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__); @@ -357,12 +354,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 +402,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 +425,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 +544,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 From nobody Tue Dec 16 08:39:18 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 2773520ADF9 for ; Thu, 10 Apr 2025 07:12:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744269132; cv=none; b=Mdh8424gJdyNWugGjX8MhG8Eh2ZXht+Pp/YSFzHjWYyW0L1Q4sulcdIAJvX11OPb9Db82UUg9UlEBQUC69KZpsTj/XB4yvksvDDNsxR2a9PNAaYs6TE4LuPKYTWNl2XtilknTl8vwFunnlCslwhceJezkSrTsZWlvFGPzocBviA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744269132; c=relaxed/simple; bh=8dH6+g92VQES3ftQWMiuuopF3g10eK3crUEyrnHuCl4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h39nVc5xbfJ0+JGn+ZqHfLPC+f11/E2Jd39hg42utVD8aFKHjvXWVzGz15SkKGR4rE5W5hutnd98sBZX3HzE2Hz/JZJ5++mdbUfgNspaQfoFLE2roMyVBa00K3ykYljnPz+FCBK5xy2RN6Y1biaPUsH/xUivQlnLwUuWn8EYbPw= 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=a2sc8rel; arc=none smtp.client-ip=209.85.128.51 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="a2sc8rel" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43cfebc343dso3391425e9.2 for ; Thu, 10 Apr 2025 00:12:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744269128; x=1744873928; 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=pl/+DUVxi7AcDtcZxL2s+ahzJl40wiTXFkQxBjrab7o=; b=a2sc8relFAum54vEo3qcGLaQazDWooWLcphusrjnS6woI+/+skro7a/UkTlszoGy/7 q5N5vE0s6WEXXlqr8A19y+wha42oK/DZHB+N1LqZiRNd2cWkwtAok8hR5QhZ89WBqo77 AwYUOE4IckJsPpdb+9EJxH71H/+rHW/doGS8bnIwRO9RsIEglFQkS3g3tSsqmwzsN6Kh WUNq2045DpbHOK/bhx0UbiLtY9NDSTN3MfRQeTtXSSc+o76gFONCACtZYs6NmlITyUjy cFy8pEC6ZhssjklHaM5cdk34l9XwzF7f64n380Qvs9YnuMu0bvw2oAJqU6gm0DNmGvpK oOSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744269128; x=1744873928; 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=pl/+DUVxi7AcDtcZxL2s+ahzJl40wiTXFkQxBjrab7o=; b=mAjHrnivSdaS9VkqPjNWUB6++LigMCn4OyLMv5kmJZuPqTgfhJT0SA8YrPQ2jDG9il rKJBjg/oH1iPBdNVJ8IN0x0q+jjOxmn77w+BqUCJvttM4/AL7t0CRXeMZIf0XloU+i4c q64VdTGj3rtsTWQWWR3EKN7apkPnwcP0Nb0ma34JsY6V4ClOb/2sncQDiJigj6gPBD7k b4nUJhNutb7GioWuEo+HEVI8XEMIw6zxCs9Z/07DrutyDvTIb/tkC6yz8M4e3IFZoE7m jAq2LPWulTSHCJbgdxRTwoLXG4hERKn5rCeTqORgtY6DBuFjdkE37wOYpC76vjSbytgf iMxQ== X-Forwarded-Encrypted: i=1; AJvYcCXpPJ3fvNEQt0LVekVitykQv5/9rzSMQvQA2zbK3AVBPGKqyJGiqEKSOF2I4XC6uwgWn4vMC8hxEFbBNX4=@vger.kernel.org X-Gm-Message-State: AOJu0YzZkB7iPW4NldMQ9qcNJfdmca+e9LsdXbCcMjUAojT84k/BZ6At of+V86+bxxWCRYJGVlW/MYkyM1L/lcyOSFX/topMKDgFJU9lub6f X-Gm-Gg: ASbGncvoFS4phhtQMSmea15zcqXnUiMkC77nAphBZljnLbA7SmcsY1R+AF9WL8fLk8y 99R6UDQYAAxxFzQ0LOFTvWm79rKZQZ0yzfNcLnx774aDhTiOvSzMI2havob0TEXyhZW2sQqW5tv EEcOxWFFD6Ajbs8ywizAGUfKkd7qg2pQ//q0M1jzep90/R7G3nY2dVKWTzgjPTzrtyojLktY76Y 9v2gaGNnVqqvsDdzBzrK1n90LgGJ+uAOHr/J7Hzbf7gJ7L1XamizWhKglY9lc9hv22WX/g70xS2 GQVnahjkJMaeibLcL5Lu4BfGEW9ITsJdygXhi8LAYCQqoy1Q X-Google-Smtp-Source: AGHT+IFKOizKNgXJiOVsYiBv3HK64AKvXsvFVzNgoDyi5iko/WqkzEdPTzOiUR8ZxNMs9nkR7CrXAQ== X-Received: by 2002:a5d:64a9:0:b0:397:8ef9:9963 with SMTP id ffacd0b85a97d-39d8f4effebmr1176752f8f.55.1744269128257; Thu, 10 Apr 2025 00:12:08 -0700 (PDT) Received: from pc.. ([197.155.71.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f235a5e90sm40831765e9.38.2025.04.10.00.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 00:12:07 -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 v3 2/2] staging: rtl8723bs: Initialize variables at declaration in rtl8723b_hal_init.c Date: Thu, 10 Apr 2025 10:11:51 +0300 Message-ID: <4d52a207eadd99ad998214aa8eb059f725c94802.1744268316.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 concise and readable 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. Signed-off-by: Erick Karanja --- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 81 ++++++------------- 1 file changed, 24 insertions(+), 57 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index e15ec6452fd0..893cab0532ed 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; @@ -835,9 +827,8 @@ static void hal_ReadEFuse_BT( } =20 if (offset < EFUSE_BT_MAX_SECTION) { - u16 addr; + u16 addr =3D offset * PGPKT_DATA_SIZE; =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 +2364,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 +2373,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 +2381,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 +2402,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 +2519,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 +2823,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 +3198,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 +3214,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 +3249,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