From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f1.google.com (mail-pz2-f1.google.com [74.125.228.1]) (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 5D2313F6C4F for ; Tue, 7 Jul 2026 11:25:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783423538; cv=none; b=PLlcED+6U/rVJi62KyQ9XTaR7xkIaLMXidCZcx4rAuzYi2qEVz6Mqp+0Mo6ukNlOQtSRdW7WPFhAkhAv1BPlPEaOMC5bDnqx/ZJpOeFdAiwkL9MA1U7G/OQlaAW6nMh3NI8m+q8ifTDOcdRiY4B57cSpsune5mBfXw55mvyzgZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783423538; c=relaxed/simple; bh=oragdnIPKUqYSptPQWcxL7fDSWqsFmpaKEM1+bZE8aU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L5ZI+nQonCooJfPL3cElyzu5A5qQ6YqKgGe6MMOglZWemdGlTxtGizOMrzs6Q+a6FO/2zdVrnCbPM7vAsCRpKigEli5UcfkLZaG5s9o1bt43LXesd8YtwpRsXWr5jUbPAwdkGGmMN3+1nVCAwPMaNpHkFy2nYaA6vDuK/MPf6Io= 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=RtdOcwLt; arc=none smtp.client-ip=74.125.228.1 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="RtdOcwLt" Received: by mail-pz2-f1.google.com with SMTP id 41be03b00d2f7-c999d839661so755152a12.0 for ; Tue, 07 Jul 2026 04:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783423535; x=1784028335; 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=r8Jd8VlbWFkQwjU2122/GkhH/Z70hMuIO8M5Yh6Wi/Y=; b=RtdOcwLt4AUfhJuslmnEr/ArbTw2dG+6rxR389kqTTQemzhIYCuWbg1O22Iy8A29JF n4wUI5b8lWaeuw4q//W+kGsnlOzqQoH1lMHqVZ/SAwBnrMmx3XbVide7y39UhKJk8Npm JHpMo08kU99vW0JL1fhlDGpPYwI6FXksQzoiAQMLLs8JRfzEygMYRtWlnaX8yFvas4+p GQmjjxsh44msTWn6nbh2A/N1xRURrOkRQzTbn9XiPpgFQVX7ZVYtTzZ9e3c+pEIqov9v SIbbpbKI3RPkrDU3R6QnUugdgolFLRTeLI4iyVjl/iIxw51u8wNxmO+3L7E7TXtNWkPg kuNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783423535; x=1784028335; 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=r8Jd8VlbWFkQwjU2122/GkhH/Z70hMuIO8M5Yh6Wi/Y=; b=Y+VQD0cDyB15gAMmW6CFPRe+efoaJGifQzqHGSDbfYWQ7mznTNe3rYweCeCtpZQ3nz 4CMDmgv+fzU9l0SCWcxaLLmSQkVQgsFbdxGKs3RhRhWeorBkkpXhnk4T1K4+XlTsxyUd /ZvVw9tjzX5qPgkeCGq3tGPu//2YY9azG1K1ZXPdhGKrcIw0pkUkOrTz/WkqKYVBuOd1 KKV4iOTFA8vfCTSwXUVjh6TULSYK5j1mQho1IrhC+IDDXvM4v0qM2/p/0qc9DDSN6tz9 vyes60rTPjtHIy77pLsW0zeUX2M4sfkWkTvnO1k2B3oAfr8p1G+u5szOC6UOPEvEZbcn 1xYw== X-Forwarded-Encrypted: i=1; AHgh+RocQ9A+a23/+8M1EvobO0kkBsjMMHJrRXKLACCweyHcHuxmABjeW5ydUBhsaDkkzZ3LTEwjAv5PNBDHhqA=@vger.kernel.org X-Gm-Message-State: AOJu0Yzj5HFtZd3o5IJlqCzEk0PyPVc4Z9IoH6Tc7W7lM++gx+OxVNPJ Y5m6Xt0ErHhBPKF+1LZjuzddqeRD9XMkKNIaZWJlcdzSqRk9b//rTUP+ X-Gm-Gg: AfdE7ckaWcQu+d+6pUYQFkDYS33LctrueWqLTZ7JL5YaJgelc87vy+aoXEpyEsz4Z55 735YKkGVKekJpPxspW7tMj3cn0A9cs+d9sLCMg0mZSOi/iyJFySb73HPAxdXlCA5unrM8uSB13m mOuuosJZJavpEskYuc0wCZlSu2e8VD4JaqyjKMzScw9vSbBcBPCqb/cH2i8xLgn9ygGbNVuBaTY zbQMaAm6wdBI4GaQM//I+C4e5khy+PCwQeQcNURmqpSsZWfAgsJs1F75y14g23hAY4HqUCtSdtF nLmFYFraLHWxW07yaV+lBlPruh9zXvUlsWZBWsXzmofd0Rkyuw4BDRIMzOZQ8UoyuDn4mPtKQjf b2VCvokA2i5plmoIvtYzlR0HVNTXX7HJv+5rVNMIN+6aGT64qH6LMOycbnXi5Iz++dtYijXOV1I hTQ/Cd+QRvuXjiJSq80B1Tcd/lcombcTbPG3e+FMgvNDCU X-Received: by 2002:a05:6a20:914d:b0:3bf:bfd0:2a11 with SMTP id adf61e73a8af0-3c08ef7243bmr6324499637.43.1783423534665; Tue, 07 Jul 2026 04:25:34 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b65960d88sm6548721c88.6.2026.07.07.04.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 04:25:34 -0700 (PDT) From: Hungyu Lin To: gregkh@linuxfoundation.org Cc: error27@gmail.com, khomenkov@mailbox.org, khushalchitturi@gmail.com, s9430939@naver.com, marcosandrade95963@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Hungyu Lin Subject: [PATCH v4 2/4] staging: rtl8723bs: simplify update_attrib control flow Date: Tue, 7 Jul 2026 11:25:01 +0000 Message-ID: <20260707112503.612-3-dennylin0707@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260707112503.612-1-dennylin0707@gmail.com> References: <20260707112503.612-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.43.0