From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f195.google.com (mail-dy1-f195.google.com [74.125.82.195]) (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 15263382365 for ; Wed, 8 Apr 2026 11:14:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646848; cv=none; b=mQnOdNDkCVQQQnJKbVthCLjcM4oKTuwagSRtYV652cHOz5YHNLgmthOVu2aBIFVmEoQAsWVj5LTaMDmNuqeA4DjvH6TdJq5/5LaS9xA7veIIS5RmqAUmZy3DP82DCR7BqrkBjOqOVVuAdCsXE6EAR3nlZXu9nxAy80xu8JqFrkA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646848; c=relaxed/simple; bh=LrjH0db+H4xacV1aL7fi3b+fr4AGYHV065KdoaKvxn0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qdRgtRqG4wr08i5VW0dzLd/42fYjVaAYbzNYHGTnp/Iil0Y2NFa+xTqGI6o5oX+1BCe6fyl+T2ySMrqMQBfQnzBlC+TMbhVk2WIEO1HOQZY/bdQK7QHVipIYDi2oDHyGguj00is/87xldJUp8KR7lRZHnu4OqNu/jgYqFAu+jYI= 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=AbT9FkJb; arc=none smtp.client-ip=74.125.82.195 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="AbT9FkJb" Received: by mail-dy1-f195.google.com with SMTP id 5a478bee46e88-2bd9a485bd6so15160686eec.1 for ; Wed, 08 Apr 2026 04:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775646845; x=1776251645; 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=tbFvSdZmXXxlkU1H8d8iS7m968Y+TZGCR1gQMqOjC9k=; b=AbT9FkJb0inPLeuYXV/9H9S/b5EBXkAfPr06HbjisuFRY8a+m3ympgLDfgD8T+6k8L was7/Io1Otaq9atOZ4GTLfK1aHqM6a5XakMlOPTHgk0pHz6BM4hgrivOcq+snp/6xiZo TKp1/DXPsPuYW78DSrPBt2gphLI5CvuRNADNwmfd0Ts+OUYZnDMYAVSMiJ6UMkqGqguw wUgBjmLbDz8qsMsx5OvNrMIukIMcPmDxE5qy9EbWiQQi/ylziqvfCtz638hV/gdYebDL 313nBzwLIDXg07OXDuI1ZmLcF7cic6UebpbXAbzs8Yl56xbH/jFwDklWneNrbOOCZ8Jz OGdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775646845; x=1776251645; 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=tbFvSdZmXXxlkU1H8d8iS7m968Y+TZGCR1gQMqOjC9k=; b=tX4A6rOhCkcwt+jQnEICCzqE8U0QorwQxhvn99exy8s2j6TDtUFqrZzJkQL0chVtFN lWPOwmFPYKZAJ1+N8W3Efx3YKRaIn0mq/0VOOUkTTtGGwXWoEG9LBTJF8XQjzXgt2tpg +0vYsythtXT0JnRIs3+HbTsITl0UQWKrbpw1eJtBcuHQ7wPI5Z70u1HB0gcZ6EjmuQub NNGs1s1kzvvk/hZ3UPv4MVKJTL7Ek6JK8sHHB5MJ6favlJIzKRO8aCQmI9kXWzTxLRpF 1FHsrd4hFyf8/na1eCMESDmvoJd+1JVQlEttL0x47+9b0UHjCvcPYYP6B4kVixkMoz/J zgOw== X-Forwarded-Encrypted: i=1; AJvYcCWtNu78V6AuPMGkzPvQ/1AHDs5Ik6wyuOkAMw6JyUie1/sfMZfRRH1jTsfOvLvtrZVI9iBxcQWOiKVo9HU=@vger.kernel.org X-Gm-Message-State: AOJu0YxPKu/RdGL/Bg6D5Y0ciXw5je/nlUHbVXGI9Z13zusSos3Xuaz+ Pwv4/fkvjlYhWCRuzXfG20OnlPCD6jyJG/QPcE5/E7ckBKB4RPAKPs/gUyvee6b6 X-Gm-Gg: AeBDieuRWmoiDmKHYfElHd8CmA0zdJhxuyHel2OQCzizBdeFiC+F73WZu+T2WHE6q1S eMSLmZKl6+V4+okhyt6f472AjGENKqcikoCtXxgKWtdU3LLQBzI7yjWeMQaQ4Li16E9TafguCUr tjWIh/FZMfg0C5ufD7c1TnbS5Aqmgct6W3+hC7Y3IMbD54Acjv1ILVV8KpI0pSQ21W0Cns+/KPN ejGLCAgk+Okk+xiE0ABFwxotzveRMQYs98cgWGAm3zAI+eNhGu9GzrKaNiPIpleeu0pSoQ6YNTu oUZlqUz2foxrYN2ZZrFFwy9prVHZ2vBRVA9oxuc5Q9B6adTNx9UrdM9m8RbilMgGC2FU67hG/8q z/Yp8QKNFZFbVowqafw1P6ovWgErRCXsfD5iroRYnQeWaHes7Mga3JUhd2xuOE/t7CxkUxzPBd+ 3BUHUgF5VbEYuUyB1/SckeweX6cRRfh/f/Ncega8bf6Tt0Z3tQlffBgYY= X-Received: by 2002:a05:7300:b906:b0:2c1:59ea:10f7 with SMTP id 5a478bee46e88-2cbfbf79640mr11322645eec.18.1775646845010; Wed, 08 Apr 2026 04:14:05 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ca7c20c0c2sm21228019eec.17.2026.04.08.04.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 04:14:03 -0700 (PDT) From: Hungyu Lin To: gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, ethantidmore@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Hungyu Lin Subject: [PATCH v5 1/6] staging: rtl8723bs: simplify _rtw_init_xmit_priv control flow Date: Wed, 8 Apr 2026 11:13:09 +0000 Message-Id: <20260408111314.19329-2-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260408111314.19329-1-dennylin0707@gmail.com> References: <20260408111314.19329-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 in _rtw_init_xmit_priv() with direct returns to simplify the control flow. No functional changes intended. Signed-off-by: Hungyu Lin --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 39 ++++++++--------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 7bce0343d59f..f64ec8e271ed 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -38,7 +38,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) int i; struct xmit_buf *pxmitbuf; struct xmit_frame *pxframe; - signed int res = _SUCCESS; + int res; spin_lock_init(&pxmitpriv->lock); spin_lock_init(&pxmitpriv->lock_sctx); @@ -75,8 +75,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) if (!pxmitpriv->pallocated_frame_buf) { pxmitpriv->pxmit_frame_buf = NULL; - res = _FAIL; - goto exit; + return _FAIL; } pxmitpriv->pxmit_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_frame_buf), 4); @@ -111,10 +110,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->pallocated_xmitbuf = vzalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4); - if (!pxmitpriv->pallocated_xmitbuf) { - res = _FAIL; - goto exit; - } + if (!pxmitpriv->pallocated_xmitbuf) + return _FAIL; pxmitpriv->pxmitbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_xmitbuf), 4); @@ -133,7 +130,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) fsleep(10 * USEC_PER_MSEC); res = rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), true); if (res == _FAIL) - goto exit; + return _FAIL; } pxmitbuf->phead = pxmitbuf->pbuf; @@ -162,8 +159,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) if (!pxmitpriv->xframe_ext_alloc_addr) { pxmitpriv->xframe_ext = NULL; - res = _FAIL; - goto exit; + return _FAIL; } pxmitpriv->xframe_ext = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->xframe_ext_alloc_addr), 4); pxframe = (struct xmit_frame *)pxmitpriv->xframe_ext; @@ -194,10 +190,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->pallocated_xmit_extbuf = vzalloc(NR_XMIT_EXTBUFF * sizeof(struct xmit_buf) + 4); - if (!pxmitpriv->pallocated_xmit_extbuf) { - res = _FAIL; - goto exit; - } + if (!pxmitpriv->pallocated_xmit_extbuf) + return _FAIL; pxmitpriv->pxmit_extbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_xmit_extbuf), 4); @@ -211,10 +205,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->buf_tag = XMITBUF_MGNT; res = rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_XMIT_EXTBUF_SZ + XMITBUF_ALIGN_SZ, true); - if (res == _FAIL) { - res = _FAIL; - goto exit; - } + if (res == _FAIL) + return _FAIL; pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf + MAX_XMIT_EXTBUF_SZ; @@ -243,10 +235,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) res = rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ, true); - if (res == _FAIL) { - res = _FAIL; - goto exit; - } + if (res == _FAIL) + return _FAIL; pxmitbuf->phead = pxmitbuf->pbuf; pxmitbuf->pend = pxmitbuf->pbuf + MAX_CMDBUF_SZ; @@ -258,7 +248,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) res = rtw_alloc_hwxmits(padapter); if (res == _FAIL) - goto exit; + return _FAIL; rtw_init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); for (i = 0; i < 4; i++) @@ -270,8 +260,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) rtw_hal_init_xmit_priv(padapter); -exit: - return res; + return _SUCCESS; } void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) -- 2.34.1