From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f68.google.com (mail-dl1-f68.google.com [74.125.82.68]) (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 81BF83955F1 for ; Sun, 14 Jun 2026 18:23:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.68 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781461405; cv=none; b=YMN9mBGcFt6zbcFWN6Em7U7VE1VoEi7+/Mkbo1EqPAX4q463NMpH0PBUsEA98b9nz8B3Gv5a0okdSMM9CMpTzsiSfR5z80Sy6V8A9QxgrXIXxc8eTjLy+36QO4fdrBhnaVVf3XU8uu5exiY+hcA2iZPEdFRHowxFddWq3K6Bg+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781461405; c=relaxed/simple; bh=aXgMIHimi/XtzLO2hYvD+im1qHL1uHoU59wrbQnr2bE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qzEsZj2oH5T4v5DqfiNb4JKUBzFGjXN8UOcWkV7yYgKJBx2OzkxTvLZCktyzHLd7CqL119NbucKhazX8SnnfSp8zK3xJ+C1XbTaB3q5T4KaDNLXoXHBtvpyBcEmDjjgSWgU0EnIM7rK62LvMTZiZ8qM+GPcrhQpTLppMb1yDS/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=O6uCXNBn; arc=none smtp.client-ip=74.125.82.68 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="O6uCXNBn" Received: by mail-dl1-f68.google.com with SMTP id a92af1059eb24-137dd523634so3130209c88.1 for ; Sun, 14 Jun 2026 11:23:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781461404; x=1782066204; 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=P6uh8rCm3G+Q5haU/Mo8ZtulNeZuEd7lSKdspHGQ2JA=; b=O6uCXNBnjrI7SbN/VppTwPR3FWXRY08s2pU5FmJedJsEr5CG1yzS/GBDCARxcjotSD ND9YlBpueNJwG3rMo53RBAmWw5Uy2ehSNwglCG7016PrNK1sgwVRopU++qvYqBbPrEoa deCxHkvjHjmFj0jGM1awXF1xOWIg4KHrtHPzyTSNKrQZPVfzSZLbR4oLPV3r8LKw9c+D oG2f0BAizaX1Bi9IPhwhDJvFBaUXYD0ppWMdmtSV4tqyFmeQBpajzr56MkMibuVQ+3rY Avwn3xVLDIhmUInn1QF9dfv/a4As6lt/fyJBju5Z65dSeSZIWw8aWJDQ/gkpIvvJXCkt Q1qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781461404; x=1782066204; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P6uh8rCm3G+Q5haU/Mo8ZtulNeZuEd7lSKdspHGQ2JA=; b=Vhd5euMLAIFbl906KlG+FuxmJFPpzDAKHaNkAE6q2lMJ+gfORDpcwoBBnqWFxPXBdH bHy1Dw+64njTT9+JqvdNxe5giEifA7mJllzmLuMc/MJ5JLHVZYb8YYPJc04Ykcm8eLCy xeiWrgkBaIQpLM/RQWNgrhKlWyDn8QayUdzeEW9zY+oTSeZyKGpfrdyHBOQzH7nRtBMU u8CKB4LvvbQpOa3jmhkuK1cDITolu13ysmBfGuWbtZQBwcWgODCfe6xiJFVjDgVMh/Uu 6P7jZluGK9eCXE6ir/DFNfONW+ztVoe5sYUYVnwBrycpYVFmwDOtys3qHt+Jt9i8P56/ 2hPw== X-Forwarded-Encrypted: i=1; AFNElJ/3fYLdtavIvU1xbTZXbjas5on/y7lBmyi4JTrSAbdhu4X+Gg90SjpTCW8Fz3Imp47WksSAbbda/rgfYVA=@vger.kernel.org X-Gm-Message-State: AOJu0YxfqD8V2zuYEMK3k9v8IlAybxtX8HudCIjmKL8iyt7J5XTWLxgT MiBuYRNhwxASxiiOR1VfBn5VlsoKKaLHvm0fy42i8tWXe9U8JrxUnozH X-Gm-Gg: Acq92OGZ0auJ+EcpL1FYWrmhF8zxvw7KG3FLCf0g98IjmCHPdaf+Gm8rD/Ddftvw0yr 2n3FbRqVlXTKUFn7O2RV5CN4HKzPBuA3MSsz9LYgAFj/ycUQYHLXhjA8sW1oDHPrOzMp7rV/I6f 08pQwpCb22jGZ5ocJNjCd7UaDkKV0185XcXW4HermWRG69TInh1jYkSIKWvUJDNR7r6uOkLq4Fd u/GvKjEZoht/qFUqBIdX1J3SDK1VgQ/B8XikuwVfIdkO7QhRbIdMFDHkBHxGc+jFVVpJt/ZWS1h XIQT7+FCenJoSNi4IdlbK0eLgmsy3zj6pxwuIIhTEUgIhtuw1t2wgsyj1qFxKMc3KNXsTNl51O8 o5ddB0gJUOo11z2MqdqY7ueye4xOTKE3gV7sP84ZHzw8md6uomXcwmizulvSya6O+N87HiIb+U4 jANdEjrUhTI1L9vh5lmrvps9ETSjhd0XmuoJ3ll7Ka7No1Dq2/qzb0s40= X-Received: by 2002:a05:7022:40e:b0:135:5d4b:2096 with SMTP id a92af1059eb24-1384bb9b8e2mr4465620c88.36.1781461403621; Sun, 14 Jun 2026 11:23:23 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1384b975e55sm8435022c88.13.2026.06.14.11.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2026 11:23:23 -0700 (PDT) From: Hungyu Lin To: gregkh@linuxfoundation.org Cc: error27@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Hungyu Lin Subject: [PATCH 2/4] staging: rtl8723bs: simplify update_attrib control flow Date: Sun, 14 Jun 2026 18:23:07 +0000 Message-Id: <20260614182309.96110-3-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260614182309.96110-1-dennylin0707@gmail.com> References: <20260614182309.96110-1-dennylin0707@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace goto-based error handling with direct returns and remove the temporary res variable. No functional change. Signed-off-by: Hungyu Lin --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 25 ++++++++--------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 6ab91de472b0..7d10caf8cbfe 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -664,7 +664,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p struct sta_priv *pstapriv = &padapter->stapriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct qos_priv *pqospriv = &pmlmepriv->qospriv; - signed int res = _SUCCESS; int ret; _rtw_open_pktfile(pkt, &pktfile); @@ -741,20 +740,15 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p psta = rtw_get_bcmc_stainfo(padapter); } else { psta = rtw_get_stainfo(pstapriv, pattrib->ra); - if (!psta) { /* if we cannot get psta => drop the pkt */ - res = _FAIL; - goto exit; - } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) && !(psta->state & _FW_LINKED)) { - res = _FAIL; - goto exit; - } + if (!psta) /* if we cannot get psta => drop the pkt */ + return _FAIL; + else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) && !(psta->state & _FW_LINKED)) + return _FAIL; } - if (!psta) { + if (!psta) /* if we cannot get psta => drop the pkt */ - res = _FAIL; - goto exit; - } + return _FAIL; if (!(psta->state & _FW_LINKED)) return _FAIL; @@ -762,8 +756,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p spin_lock_bh(&psta->lock); if (update_attrib_sec_info(padapter, pattrib, psta) == _FAIL) { spin_unlock_bh(&psta->lock); - res = _FAIL; - goto exit; + return _FAIL; } update_attrib_phy_info(padapter, pattrib, psta); @@ -799,9 +792,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p } /* pattrib->priority = 5; force to used VI queue, for testing */ - -exit: - return res; + return _SUCCESS; } static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitframe) -- 2.34.1