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 BE2AC349CD6 for ; Mon, 15 Jun 2026 23:44:01 +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=1781567042; cv=none; b=pKy8bGEdgYDflwAGCJ0sfr+4MEaU171f0tbpTEl95pUgHAFNRzu92id0/ka3WIfdoAR42h2Vczgjo79eDeTWHm/VUL32iaUvljzd7P3SyhBgfr9CaZAs7Q2I9sr9XPLNQj3gyjGO5Pp6scdd/j0TNybtAcl3QRfQmP+NkO0luFk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781567042; c=relaxed/simple; bh=ZdPlkL2fyLTXzJe6AczWhp6+4Uqn+Byg/9vH9FfYgIY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NMAnIp3SYTNZnoNVIpgWkAdacXrCfDG5/K3EW2I8RfYZoXAQoKKzSaLUl0VUURALgN6WJiyqmORNDDVaYuIWyOumxIA5kHtt8mEZsUUiMQtPGKT+M9vEfYdU15im38CCBDoIsnLWHmYwbk/+8a2mXuqnVwcLIRGam5Rb2DGw67c= 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=PlwErFKu; 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="PlwErFKu" Received: by mail-dy1-f194.google.com with SMTP id 5a478bee46e88-307d0405e07so5950875eec.1 for ; Mon, 15 Jun 2026 16:44:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781567041; x=1782171841; 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=PlwErFKuiRdTlfv9UQC00iaCWS3Yy2zFi79wUrrm3jOEB95j/R03XeUM7MDDkw1BZF N9YvwKhQdOyTQpv4TfN4GsrceBop0jwrUx7KjZTYAcjYXl9/yEhhOSRGf3qqpHO++5GC CbZKeQ2xo1cF1EN1ntT0mRBnOoj4sDMWNvU53Wo4eQ98es9gLKKKMGPPmzMmkA94uPnr F/ZHKRNJM9pVHsRx28HM+5rDypAYDRYmD8oVgYX4a9IXTueNMs2jzRTdkaZaEAVffn4c Jq74VVkvzqBPvaCRDanfTBVTd9ObBdJA15AzGjTyaavMCU5cyiOeSphYM9rtzp4vlGKY 4leA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781567041; x=1782171841; 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=dtp22x98ZtJ4KdumPCFgPbjNzdI15mTfx0OBYk+VAmiCwX5s9Zh9WfkUoL4chrGZlr UmBXtlByXRBEoeSr07vkdmDhC2ounWrZQV5cYFejeHAnFMa22jDNZDCZcpa3sMRfT6wO O8sdLJaPbqjxTzCCOQpgZlIk9DxllgfSErlLWFCvOBxB7/X22hWRhuTI/rMUoJGG6f5X HhxRf2rGsOjEnzCVLIM59+kSn+35vVa2NV59hdu/qKTK75LPlKH4aWzuivYBzrez50Bp 9G4gyzSevIq/q6cOc7LknS4qn8mOQ9wwmDmynGjZl3rYvexAKUReV/KlPDFECLXLBGM0 7Uzw== X-Forwarded-Encrypted: i=1; AFNElJ9ENg9Zwvs+btEwM0RibYMPDrRMizZDOnLSNV2c2t6VwblX00ro0mjeT4vDvYrwdBirIatJ73lJOwiClw4=@vger.kernel.org X-Gm-Message-State: AOJu0YzpNN5wIwzlU7GInDrllysA+i+PasBk9S0qDJ92oZsOa4apdNyV vYDUBcYI6TAQ929XQz0e3WocF6IOmR28hmrB/kP6kjKnp+1GdVNeuoi9 X-Gm-Gg: Acq92OHSyGF8TAM36SsX1yj76bZa3hQvw1X1d/0t1uftn11az8kkRBMUVcYkdSZzP/1 msE1GIfXYr4JtcCYkuPxOt7E0QgpOGbA2byauYYOPnan0MdQeeSiRO9Rw11sPgPgv5AkovbGSvr i7lugSZLamYqmhXOw18U0ydkWe8trMOCo1AutGFs2cOsDh4UZhDPqRLyaCWRcMpMiL/NUqNQ2QA Aa5Sdu6X8GfEJPwGfoRWZlWPpJoCXZUHO6drRVrdTsHSO0ecNy62UdbAHSXVQ9Dc2lCBLx+F46y Qh3W0lnG69IU/NHy8Q0B1+Jj6cOGGSmlBIqNSI+uyxPMrYsbeQOtiJKTcU8lZExllhsgLvYfXDs eOvdljUYetHo2xzVg6rRwO5yr9yYti0cyOjO6PCRujUp4+C1pwK5XByNZA6z8/fZHrOpHfbeNVq HCiqDtFX9X2ZBNs7vTcu6GjLa5h58Pm7QpulhpCq4TiJZVg9N09AWlytA9C0KPhps3EQ== X-Received: by 2002:a05:693c:23c9:b0:307:393a:8f1d with SMTP id 5a478bee46e88-30936767158mr7390933eec.14.1781567040847; Mon, 15 Jun 2026 16:44:00 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e92096esm16988335eec.15.2026.06.15.16.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 16:44:00 -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 v2 2/4] staging: rtl8723bs: simplify update_attrib control flow Date: Mon, 15 Jun 2026 23:43:38 +0000 Message-Id: <20260615234340.97299-3-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260615234340.97299-1-dennylin0707@gmail.com> References: <20260615234340.97299-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