From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f194.google.com (mail-dy1-f194.google.com [74.125.82.194]) (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 C864548BD3B for ; Tue, 16 Jun 2026 23:53:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781653982; cv=none; b=KLXIIHa6cWZpT+cCCQPHl4/RCfFKFeyrky4pRYxpwC3E0d4w5LPPOwkH2Kz4JruuaY8KQ/6Ct1ZkWuWJAg2Vm06NHqD/rRX7tmXhkMS+hOfbPEcjdrMfvFT2EmPvk6esTUwA0b6bDvfAPRf2Z9qkxH25hPqDWiE/T0XA2LdHJCE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781653982; c=relaxed/simple; bh=ZdPlkL2fyLTXzJe6AczWhp6+4Uqn+Byg/9vH9FfYgIY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a2UHQuTqtf/QLZKNjgrsJMQbrMJKxim9SDCu7WNfrpwdOuoKHW7f8OXBz4xDkOac/zo+tOeEOeMIHy+HWgeSkAwh9+KGkwTau+fyoqT1svHMqJmWFkEmuJD+d+zD/XXsITwzTKV8gDQb2u/rqrCDPbSdk3b0ELIGIpeTtYF46IA= 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=A5WYJxfB; arc=none smtp.client-ip=74.125.82.194 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="A5WYJxfB" Received: by mail-dy1-f194.google.com with SMTP id 5a478bee46e88-30bc806fcf8so628744eec.1 for ; Tue, 16 Jun 2026 16:53:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781653980; x=1782258780; 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=x//OojVdvKsF1B5rqWRkEUus6sx/pFFpIK+ZoZjUJyQ=; b=A5WYJxfB15mhG0Oii1zO2cqNm4k/EYUicBn4wNZnsaqJapjfQaHvCg+PHpoIqAh+SH /GlnDllzOwP+CmntdYvWUezwj2nWvQnhYeUNBN22t4jvlvWePM5nU3O5q5qjyPjgEuCm kXhZ+aL4SkwnCv47UyUXPqIlk2qp8foEE7B+8rCOo0CXd8nDV9riSYGrNbm55X4eakyG EXb8WmSJ+uFD8lDZ8mJTkSu1OfD/EshN02yOXrIuBs4MYv7MHB4pDqdBrqOBWkZ9x2xp v45Q+IarG8FOzANb2nCaQAvqAae3gjPHiSLj6eQ389LD2oXMGavULJAZyG0kXhCy6FCY gR5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781653980; x=1782258780; 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=x//OojVdvKsF1B5rqWRkEUus6sx/pFFpIK+ZoZjUJyQ=; b=IFMhkrrHf5Q2hxmezI80ns6FlmUZqkPv/aXYgCnNJCMLR6uo/kJgN1gCBdMAsXC7RF 1zaZj0EoPZXWIENus/TwVkA2fFnEnhSdmieSQSRhKhGnwX0OofvYpeDmpk5f7LlYcRkj p/UVsya5c7S59/LnqJaeHLM7htjRBA4NASSt9lT7MCSnkgkoWt3tePLimgCMuI4fPFwe erDpSDdYVC6T0Y/NkqhGQOvrzR318Re8WJSiYuhpKClJRQ8nQRWVCWzOgA6fxxT15vDJ vZBG7KIu7NvdhY8y8CTzgWsCWE98lW8Q7IGVhQVP6hVj0LTVp2xyqjgkzDroxx1xqXJN TOFw== X-Forwarded-Encrypted: i=1; AFNElJ/EYq0C7IZpQpfihbytcat5HlNWNW5k3Om18uxogElpZnyXI2A4hwcHNaKKgHuMGpbzRF+PwvmppG1Idqo=@vger.kernel.org X-Gm-Message-State: AOJu0YyNEjMRDypOc9Fy53vapmWhiIp49Us2YxcRtqbC34PHD92NWBdI gI3tb3nbg6hQhBBFTl4NIDi77JnJ+OYNez9LUS6GVw6UWjvEnnNlSDd2IrW9rsLZ5SE= X-Gm-Gg: AfdE7cnkLeCJOY+C+WgOTu6XIHc6c624giuRWejlhijzhzlPbAs6z8L9BwSvU95P2wl EeSWmMxozb+YqFDqEpBZrQj+gLPXS/n6onMxhG0M4E4pI06FsNJ2X2ytS5Hhf8rDCmAERMKsE3b ucXmBfyw+X220w80IhFQyyPpD9ihZv80s2fFXqKEnwMbtcDoyJopr+a4rhB3VJ2xyXWhh8atQ32 RPC25ka2tvBlvQgwy2DtJlIeyI5vmSkNw7+m04sqeH6O6UeH40Z/iD3V+iXYyR6z/zw82MoAe4F AdqgBZCE5NEI3Z/mfuLJcDnWun4bo6U/zSU2OJBCvVgj3MzEDrNXW/B2ng0+u7eGokEVQGWADQP 9cv1g2s8qDn9x4K7HCzZr18xr/JprU4ZzwzfHnTY6rrAnpFBFEm4llQQN9nfKSUNKOiXpTXPBeg LEYs7gbXollWqjO+0OWEcOV244i9T3ZWYK8wQ2M1d9GD4lEfOSwUmsPJY= X-Received: by 2002:a05:7301:6742:b0:304:e6f8:7cc9 with SMTP id 5a478bee46e88-30bcae0434fmr839165eec.20.1781653980083; Tue, 16 Jun 2026 16:53:00 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d3f20sm20208153eec.9.2026.06.16.16.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2026 16:52:59 -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 v3 2/4] staging: rtl8723bs: simplify update_attrib control flow Date: Tue, 16 Jun 2026 23:52:39 +0000 Message-Id: <20260616235241.99076-3-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260616235241.99076-1-dennylin0707@gmail.com> References: <20260616235241.99076-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 | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 6ab91de472b0..69b6d3a2554a 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,19 +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 we cannot get psta => drop the pkt */ - res = _FAIL; - goto exit; + return _FAIL; } if (!(psta->state & _FW_LINKED)) @@ -762,8 +757,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 +793,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