From nobody Mon Jun 15 05:18:25 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Dan Carpenter --- 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/rt= l8723bs/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, stru= ct adapter *padapter) int i; struct xmit_buf *pxmitbuf; struct xmit_frame *pxframe; - signed int res =3D _SUCCESS; + int res; =20 spin_lock_init(&pxmitpriv->lock); spin_lock_init(&pxmitpriv->lock_sctx); @@ -75,8 +75,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, stru= ct adapter *padapter) =20 if (!pxmitpriv->pallocated_frame_buf) { pxmitpriv->pxmit_frame_buf =3D NULL; - res =3D _FAIL; - goto exit; + return _FAIL; } pxmitpriv->pxmit_frame_buf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv= ->pallocated_frame_buf), 4); =20 @@ -111,10 +110,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, s= truct adapter *padapter) =20 pxmitpriv->pallocated_xmitbuf =3D vzalloc(NR_XMITBUFF * sizeof(struct xmi= t_buf) + 4); =20 - if (!pxmitpriv->pallocated_xmitbuf) { - res =3D _FAIL; - goto exit; - } + if (!pxmitpriv->pallocated_xmitbuf) + return _FAIL; =20 pxmitpriv->pxmitbuf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallo= cated_xmitbuf), 4); =20 @@ -133,7 +130,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) fsleep(10 * USEC_PER_MSEC); res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ = + XMITBUF_ALIGN_SZ), true); if (res =3D=3D _FAIL) - goto exit; + return _FAIL; } =20 pxmitbuf->phead =3D pxmitbuf->pbuf; @@ -162,8 +159,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) =20 if (!pxmitpriv->xframe_ext_alloc_addr) { pxmitpriv->xframe_ext =3D NULL; - res =3D _FAIL; - goto exit; + return _FAIL; } pxmitpriv->xframe_ext =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->xfr= ame_ext_alloc_addr), 4); pxframe =3D (struct xmit_frame *)pxmitpriv->xframe_ext; @@ -194,10 +190,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, s= truct adapter *padapter) =20 pxmitpriv->pallocated_xmit_extbuf =3D vzalloc(NR_XMIT_EXTBUFF * sizeof(st= ruct xmit_buf) + 4); =20 - if (!pxmitpriv->pallocated_xmit_extbuf) { - res =3D _FAIL; - goto exit; - } + if (!pxmitpriv->pallocated_xmit_extbuf) + return _FAIL; =20 pxmitpriv->pxmit_extbuf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->p= allocated_xmit_extbuf), 4); =20 @@ -211,10 +205,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, s= truct adapter *padapter) pxmitbuf->buf_tag =3D XMITBUF_MGNT; =20 res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_XMIT_EXTBUF_S= Z + XMITBUF_ALIGN_SZ, true); - if (res =3D=3D _FAIL) { - res =3D _FAIL; - goto exit; - } + if (res =3D=3D _FAIL) + return _FAIL; =20 pxmitbuf->phead =3D pxmitbuf->pbuf; pxmitbuf->pend =3D pxmitbuf->pbuf + MAX_XMIT_EXTBUF_SZ; @@ -243,10 +235,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, s= truct adapter *padapter) res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ, true); - if (res =3D=3D _FAIL) { - res =3D _FAIL; - goto exit; - } + if (res =3D=3D _FAIL) + return _FAIL; =20 pxmitbuf->phead =3D pxmitbuf->pbuf; pxmitbuf->pend =3D pxmitbuf->pbuf + MAX_CMDBUF_SZ; @@ -258,7 +248,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) =20 res =3D rtw_alloc_hwxmits(padapter); if (res =3D=3D _FAIL) - goto exit; + return _FAIL; rtw_init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); =20 for (i =3D 0; i < 4; i++) @@ -270,8 +260,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) =20 rtw_hal_init_xmit_priv(padapter); =20 -exit: - return res; + return _SUCCESS; } =20 void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) --=20 2.34.1 From nobody Mon Jun 15 05:18:25 2026 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 1AEFF3815CF for ; Wed, 8 Apr 2026 11:14:08 +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=1775646850; cv=none; b=OK2l4HjFgBUfSCshj7N6Incn1wIXE9Vs/TXfw7flwG6xdwme3b2lNVE9ZlL4Af0RYIeX4yHutpnvhYBVqgdD05SpdmyV73o+B22ovgcr4D7wbfY0ZhS/pqn99yYokXPA8cAJOrJbvtb1ay2q+ssDqucJYXutE506yHHBHVtTxT0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646850; c=relaxed/simple; bh=UKGoTvygU9/qk9ny9Ksdv4RHhLzICwFIrRSmxE3H/bI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p7Din3NtD85XVgqIVz81Vn4l086cWNco50N2+dC6X3eSnm1vHV8mXNoE01K2tUK5Qfz5eEiVx9HhZCoKPTgoLqbwOHUNHz+i0u9gClATiJjLHRwV0jlT9PNUhHpPRc1LL/swYhSYsIYJFCAN84jJcc2L8dinrB7LAelhJt+Gh2Q= 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=nAZqUAMH; 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="nAZqUAMH" Received: by mail-dy1-f195.google.com with SMTP id 5a478bee46e88-2c15849aa2cso8386673eec.0 for ; Wed, 08 Apr 2026 04:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775646848; x=1776251648; 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=H2u/ibJfkdJGWdmo2I009UtH6vmzi29RSvoCTFJTa1s=; b=nAZqUAMHO2D5CfwAG0aLaeC2PSvMpzQ1I5ZWKWbt2I2kxtvA2O9bwx7QHxc2gKSocG oZvIwbfI8LID1jeFfuiGeaTYRpgYwEqCsbzMeX2+Mf6Bei5zMITLmpGWJW4u6EplZjqI ZJt9ttrkLQaz7eC+YpbsOPRgopM9AFvxUof1AGroNIsyVO9zl5yQ3dFBgX0LXLF8pkYF I7UbqfX1jELPGoS2e48iMeCx4otW4J5RnHr96HBYALLlindkG+s3seH8+XeyWsbcq82A aidGVw5r6FYM0zTbh9jeZsx1BvFJ9+Uhj5EFQVEXpjhO0Pnys8JMksIoQrQh89LyoeBe yxng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775646848; x=1776251648; 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=H2u/ibJfkdJGWdmo2I009UtH6vmzi29RSvoCTFJTa1s=; b=dLB5QlmaaJUSKty4LYDCIuqiApEI6xyA9Wgd1qDjXowXeQupVIOpL/xQwX2qSG5Frn yJ56L8LejYlo0HbnoQ1+t9TVCt/cs2jHrmgoSAYnv4J/fSV4s7wNnmhI67LLc6fsYlnq gwf36hF/3cwRAvCPIHHc9a2VqWP2Grwe7kMCHq/HAumjYFGfpCViaDgcBt4ZXqvKI3Ep nqXIQZfm+/32PF6hWs1JWtBx30ffZKYPlKZ7UbnWZ3M8jcoziSBn7lzULaVFpnyX9/7O /HECihGrUsE1ZYzMruq6TM/CJSi7xA2b+NqMqMMvordQhNQctwLQElD9cRVADf9A3ks1 BXFA== X-Forwarded-Encrypted: i=1; AJvYcCUaKNVwGfG4X7JmMWtqikv8WpWa+MbQMN26VqviivmFlVToFlz3zK1xSGI27G1iG/2DCTduexXJnO1zUAk=@vger.kernel.org X-Gm-Message-State: AOJu0YxA/lApoqQv5yve6jLvfZahtYzaHYnYNOFJD3mirBCEcY4uKjKa E1kgzVABAwQ6whQ/qbeHSW+2Da6c7izINXKZ2wET3fwXt33gs5jm7Ybs X-Gm-Gg: AeBDietbcPM8Jo+/t9qwNUCg5NHcroYyk0MRgwAPTahr9h6lWZ4QxyVMT0q0TeJwypP LarWfRjpBHVuQ+PVdfypEEtjLkrvUefpjVF4IytKS/4KxfQ/oLijmAwfHU3H+/4wZvxxlFBVSVw ll70hm6Ai2/vK7aDRfGsUV9nXkh8uGGivwDmVR22YFKVUz2c2NfPM8kaDRopsN6437Z8fVGYDrH vDB5LhnGChOYpz5VmttOBmZ7+Kazh1EAXAemkUwxiamR1JAIxRgV68QIfpVi423d6EadQg8/btp 7t+TPcL3LxoaVDMX2ySmMRqLkp03LbH7Bi3jZeagxTqOXpH1ryl11S+/xekPzVUu4aHizAY2mNW dNXnJAXsiesG4xIbOLUhOts4PKuZSL2O6vKQ/b70yTgV1qKum/kTVl/f8loQXWTRN8MJE4X1hUD 6krjTFUxWguleXfKMIGKZv2tHFKvQoAi6wxTiyGuWLi2dTvC0XoMv7Kyc= X-Received: by 2002:a05:693c:2b14:b0:2c1:7a0e:394 with SMTP id 5a478bee46e88-2cbfa2d754fmr10735253eec.12.1775646848078; Wed, 08 Apr 2026 04:14:08 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 04:14:05 -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 2/6] staging: rtl8723bs: make rtw_alloc_hwxmits static Date: Wed, 8 Apr 2026 11:13:10 +0000 Message-Id: <20260408111314.19329-3-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: quoted-printable Content-Type: text/plain; charset="utf-8" The rtw_alloc_hwxmits() function is only used within this file. Make it static to limit its scope. Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 80 ++++++++++---------- drivers/staging/rtl8723bs/include/rtw_xmit.h | 1 - 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index f64ec8e271ed..b86c9c2f3b93 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -33,6 +33,46 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_= xmitpriv) INIT_LIST_HEAD(&psta_xmitpriv->apsd); } =20 +static s32 rtw_alloc_hwxmits(struct adapter *padapter) +{ + struct hw_xmit *hwxmits; + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; + + pxmitpriv->hwxmit_entry =3D HWXMIT_ENTRY; + + pxmitpriv->hwxmits =3D NULL; + + pxmitpriv->hwxmits =3D kzalloc_objs(*hwxmits, pxmitpriv->hwxmit_entry, + GFP_ATOMIC); + if (!pxmitpriv->hwxmits) + return _FAIL; + + hwxmits =3D pxmitpriv->hwxmits; + + if (pxmitpriv->hwxmit_entry =3D=3D 5) { + hwxmits[0] .sta_queue =3D &pxmitpriv->bm_pending; + + hwxmits[1] .sta_queue =3D &pxmitpriv->vo_pending; + + hwxmits[2] .sta_queue =3D &pxmitpriv->vi_pending; + + hwxmits[3] .sta_queue =3D &pxmitpriv->bk_pending; + + hwxmits[4] .sta_queue =3D &pxmitpriv->be_pending; + } else if (pxmitpriv->hwxmit_entry =3D=3D 4) { + hwxmits[0] .sta_queue =3D &pxmitpriv->vo_pending; + + hwxmits[1] .sta_queue =3D &pxmitpriv->vi_pending; + + hwxmits[2] .sta_queue =3D &pxmitpriv->be_pending; + + hwxmits[3] .sta_queue =3D &pxmitpriv->bk_pending; + } else { + } + + return _SUCCESS; +} + s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padap= ter) { int i; @@ -1852,46 +1892,6 @@ s32 rtw_xmit_classifier(struct adapter *padapter, st= ruct xmit_frame *pxmitframe) return res; } =20 -s32 rtw_alloc_hwxmits(struct adapter *padapter) -{ - struct hw_xmit *hwxmits; - struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; - - pxmitpriv->hwxmit_entry =3D HWXMIT_ENTRY; - - pxmitpriv->hwxmits =3D NULL; - - pxmitpriv->hwxmits =3D kzalloc_objs(*hwxmits, pxmitpriv->hwxmit_entry, - GFP_ATOMIC); - if (!pxmitpriv->hwxmits) - return _FAIL; - - hwxmits =3D pxmitpriv->hwxmits; - - if (pxmitpriv->hwxmit_entry =3D=3D 5) { - hwxmits[0] .sta_queue =3D &pxmitpriv->bm_pending; - - hwxmits[1] .sta_queue =3D &pxmitpriv->vo_pending; - - hwxmits[2] .sta_queue =3D &pxmitpriv->vi_pending; - - hwxmits[3] .sta_queue =3D &pxmitpriv->bk_pending; - - hwxmits[4] .sta_queue =3D &pxmitpriv->be_pending; - } else if (pxmitpriv->hwxmit_entry =3D=3D 4) { - hwxmits[0] .sta_queue =3D &pxmitpriv->vo_pending; - - hwxmits[1] .sta_queue =3D &pxmitpriv->vi_pending; - - hwxmits[2] .sta_queue =3D &pxmitpriv->be_pending; - - hwxmits[3] .sta_queue =3D &pxmitpriv->bk_pending; - } else { - } - - return _SUCCESS; -} - void rtw_free_hwxmits(struct adapter *padapter) { struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging= /rtl8723bs/include/rtw_xmit.h index 544468f57692..b0189a703d28 100644 --- a/drivers/staging/rtl8723bs/include/rtw_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h @@ -457,7 +457,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter); void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv); =20 =20 -s32 rtw_alloc_hwxmits(struct adapter *padapter); void rtw_free_hwxmits(struct adapter *padapter); =20 =20 --=20 2.34.1 From nobody Mon Jun 15 05:18:25 2026 Received: from mail-dy1-f193.google.com (mail-dy1-f193.google.com [74.125.82.193]) (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 83EDD37F72B for ; Wed, 8 Apr 2026 11:14:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646851; cv=none; b=aGY7mixDxzif//Ksun/Ad896bF/zw4konIB723tgwIrj5gmhxoRLwBh+wOmHmo+ZqWdvu3P0PJK45VF4N1KJdXuIGl0RGmIa5K622vaSQVLU97kJVSFi44pk2hc0Ou4U50jmEeN9+J+YzZW0Mg6/SsMu3DFXxVrNoXRbh5/bkHU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646851; c=relaxed/simple; bh=gqL8rrjQX2MZJ8p18pobOq9oxiN6UV6V5gJJZGg5tWw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IIepHdHjScWzbi6IfODidVllsWNPURGizP2C631V7FXUs5VHJqFiPnb4bFqVPQXGIZ/sKl4w63Z/mL3wy32bZdSlFd7QptVjVMSgFXUIpfebmJgqX9AAqddVsFQy9Mn9+wSNeN7ztcFm/z+WUoFrNj5VijGE42ZBMnbm+/kT1ng= 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=gdEWvp/5; arc=none smtp.client-ip=74.125.82.193 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="gdEWvp/5" Received: by mail-dy1-f193.google.com with SMTP id 5a478bee46e88-2c56aa62931so12297083eec.0 for ; Wed, 08 Apr 2026 04:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775646850; x=1776251650; 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=WIsVexSVozxHzKuRWPuXyHX6iHCp/uKgJC6PDZBrexU=; b=gdEWvp/5PPzb51sj0CpgWgAqS62WsJd1FXqNI1JxM5/Cu4+7eDo6pYvyNPMYprWpiP lxrpMQE96PzAr+iyvETSiC9gWguA25xif70yJIiyRTecJ22YSqCGpei3SGbUs0rcbdLG 91Gi1kRUsNEb4Po0KaleSjLqtWbFhcm/KDUZVBFGBq6VvQWlNZvKyoCK8rl9ubaJBsKJ 2BtdHjTxynl4vLGnBPJTMeHChDH9BCeE5AVMLMUJGfuRnwlR1QBNGKIAKuCgVOVf8SwM FZP1VVG3VHAFnuuXmat99k5mnsF3UAosEgA2bo1K5ImsfUPd+Jxb68L8CLswi818SU89 t38A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775646850; x=1776251650; 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=WIsVexSVozxHzKuRWPuXyHX6iHCp/uKgJC6PDZBrexU=; b=DuCekJyBPHbNrCin0tbDSKcGmkwAZi82tMfPL/mZY12+/+cJkB39p+VCgOsc58V55/ qkOATn5Te5ThcwMYQpO/G8ULiGhZC/vGGwclVx+kbwe9IpwNFlf1nD7KFiL65bOzxpEV 7/NgZ9iwYGCuFv2p8wBppRaZ5ARPgLtxkMmCzSlQfgBLz5fq4JkpRj3SlPQweAQx+XMF O5f26wabKO6a5o6wVBzYNm3WJGBtP5D/br65/L0UoIyHxS8OEEiag7qch78VIUviDJW/ /+041GsbOas5nPTygwrnaZRNLhVGYNoq8jLFL0qB0g5rg44sTD9f+/ujzlzN2PwrfytY CJKw== X-Forwarded-Encrypted: i=1; AJvYcCXVwt0Hoy6KwlX/RtvSZ0vif45Aa5PO1Ztiy8PuPbpHAo4itVJuKyKfchZqRoKGJLPm2h96la5i+D0gM4Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5P75vZFQDhzZ1QtTycuUxrCAGddWt5q99u29kL7gPqNkJgQIh vAb3j0MPh+YDs56YbS0sWCFTOuU1T1CNDsvM7OLahCqKlkBxTs5YPlVS X-Gm-Gg: AeBDiesoRZwwRclj/iYfLzLbVQaSdTvRbAyA5E5PirLhmw2DF9l2kIXl0+ctntsmY+5 +f9yj2J1XDl8eDRfN0dKp2OWBov/rQZvsQni9jiU/Wq0SWvY7Xegh28pkKofJFSD4pZyjYARrLL vGY5jMBrhqCp6wn8OFXdKGJzaptdyFa9M/0MUoy/8uI5/+uKrPAQ1xGluNvxuEFmEKWx47JrAih zNEcG8EAiHaW/E0hVoN+jGSKqgl5ZufXHEv/X+rFlcCVH3VrmMGebKx97+g75Vb+ykrn9ktNCSE Moq7zqgOiLskAFmXMNcw7O6WHp4hSEFlRizt8EcExajfzDHDY1+rcVLste56/6bXOzu/an+OrDA DuH29Qfudwyk7kTyVKrl3A5xQgf4vFzMyro5pfLpPJoLJtBqgLExdcO6n23/BfurTeQ/9UwPf0/ EH9yah+lvhctUzAUv4kwv3+kldjq9LIWg49diW7PV3ZrCWMWccC2uoGX8= X-Received: by 2002:a05:7300:d108:b0:2d1:91ce:eb55 with SMTP id 5a478bee46e88-2d191ceee50mr2568936eec.12.1775646849637; Wed, 08 Apr 2026 04:14:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 04:14:08 -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 3/6] staging: rtl8723bs: convert rtw_alloc_hwxmits to return errno Date: Wed, 8 Apr 2026 11:13:11 +0000 Message-Id: <20260408111314.19329-4-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: quoted-printable Content-Type: text/plain; charset="utf-8" Convert rtw_alloc_hwxmits() to return 0 on success and -ENOMEM on failure. Update the caller to check for non-zero return values. Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index b86c9c2f3b93..befe74a1bc4c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -45,7 +45,7 @@ static s32 rtw_alloc_hwxmits(struct adapter *padapter) pxmitpriv->hwxmits =3D kzalloc_objs(*hwxmits, pxmitpriv->hwxmit_entry, GFP_ATOMIC); if (!pxmitpriv->hwxmits) - return _FAIL; + return -ENOMEM; =20 hwxmits =3D pxmitpriv->hwxmits; =20 @@ -70,7 +70,7 @@ static s32 rtw_alloc_hwxmits(struct adapter *padapter) } else { } =20 - return _SUCCESS; + return 0; } =20 s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padap= ter) @@ -287,7 +287,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) } =20 res =3D rtw_alloc_hwxmits(padapter); - if (res =3D=3D _FAIL) + if (res) return _FAIL; rtw_init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); =20 --=20 2.34.1 From nobody Mon Jun 15 05:18:25 2026 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 7FA4C3815E2 for ; Wed, 8 Apr 2026 11:14:12 +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=1775646855; cv=none; b=UoZTYJfqH2e05rZZ3mfgtfds3iZ05S3QJnwZVqGIWxkRf8IYodhM+iOI8rKcbq5atg9XibZapjPOUuCAee8pH3BEn+TMwbJhU7OUPRKXhnypIjCbDg+kuqmlrj1OlZhHBE5tb7dIYwiVEEfUI6bHInO6lcYp7YUUsNOrtC4HZP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646855; c=relaxed/simple; bh=f0PR34TdvdOJrt1uwL6aSTlLoYOFX2Kguotwc5bcPbQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Og9I5JZjwLG1Hq2GQbCBUzWJC9HEYZW5qOCYjgYVyF+Yd8q7sO1vP51RuZEYFqT/ah6CFi9/ETmE9fPVxKA0hl72rTWVYze0CfkAK77AMxueEr2jYC8RBVLIxc66sTrMkMWMJdmMZ3EM/xepsexAw18XlCWpSZxfddyGU39w/dg= 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=UuQQ9/vP; 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="UuQQ9/vP" Received: by mail-dl1-f68.google.com with SMTP id a92af1059eb24-12c1a170a50so1716014c88.0 for ; Wed, 08 Apr 2026 04:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775646852; x=1776251652; 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=Wp4VWnoRlBF1ISs3ZdJ3il8z4bzscVAuNmEdfs/zcNI=; b=UuQQ9/vPhlB0YULireNOGrusY3qIH67+3mVf/B6YmDzETBjDVTWd22HQbIVZHtimUK 1x1z2FOHaOvygnUxnJk8dq8Z1Ug7Mhh8Kyi+a4+9U2xu6W2FLa0+2cmeCXzkOTApfqhd rehn/QcXgKTV1SRfOIX26wr8W0/AbjxDAAeDVR6toVU2EpiaJGkcqTksK7mPgOpNRkQ5 pZbIaMjqnQvJHVNU7suG3YE90xWKOITRy3eChCA+dRTYFsfP4mqA6q+d/hhwpc+Ik6F0 6SaIrI8Bf1QBf37pPKWWAtuRvX6sNJqURY5Nhutp6zmHkGzLxo42e33XX9x4hl/ZQmbV 6Tgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775646852; x=1776251652; 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=Wp4VWnoRlBF1ISs3ZdJ3il8z4bzscVAuNmEdfs/zcNI=; b=oicl8sLcWJl3lrj+HVoLnpMhEPu/uYqccUZudL58Gnb40/u2V7jCcM7OBJjLNDeTHv BSeOZuoAwILD7qlMEcKeOs2Y6ul2y25eFkN7JFouKHJh4TU3Z9Lc+EMsOkrTX6+xmFO7 3w+io2hvuUoRl1dZU3QjGhU7q9FsdoL+vC8PclT6IDnNk9m/7sqUmjoY/jTWzEUtbWuQ vKsENXahkfM5XzBJ0DaBM6iWeQkXGMMcxTqjyvgc00drDoJ40HoEEFJaYX8T7ZMj6Lc5 eImYUe/j1jusQQu+GVKU5DEkI3iD9BpsXNyjEd9ApGzSllnhaO/vjs24zcP5trm37hCD 4jnw== X-Forwarded-Encrypted: i=1; AJvYcCXKsoHcgdXFlvjqh+6xeKiCS8gMMjDIuIHj20LR0QrZhyUexlh57P/RSjAKVhbd9DiUOwIoIx/xuhci+f0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3h91qkRThbehX6POJLFApkNDgw0NvJWVrtptCETmFRg12gS65 VVpjqQ0VbpcBjIFP0LTdIKhkaIueIA2j6xA1IKWgB+/wb7+gjwOpI/gV X-Gm-Gg: AeBDiet6BerWjtL83/IFHc8NuNErpifKEsVIHBD+StQivSdB4pQ1TaSMGf+FcEZxK+W ZumDPWiYK/xZpMkc3BtEN0xSUBzQcIAmHfzdnVCIevar/pQ7HezzuC7xHBA37UDGVlVrP8sVnkk p8jmSWp3RhInYCqo4Rvvjvms/rKmcndGBtVzcUlV8eBXxobp6xvMl7qYu4uItGVivmXKRkzNlf5 AYKID/saGxh2lijEMnKOPcD2mRUbf+3gosufWCdiiXmnY7704oKmC+zsj6DWU/inqGr1TUuDlt9 rWhAcJb80f2B4gQvyp/CO42nox6TSA96Uj+z1yXlw3breYs1ajS+MJz7bo+67/QC4j0AWRagAI3 FMSUNeNnnh6l0+adxtFtenHgtClEO8ZlJvTG8k18wCCVYGRlO6tFBnN2TsU202oZpyXlxTM1/8E vzcpj2vo/TMJ3lMxcpQ3VlhJmTnbpk4/KJRRNuzt3FVvzgcRqZQ8vyZBw= X-Received: by 2002:a05:7300:2315:b0:2c8:b5e1:6b03 with SMTP id 5a478bee46e88-2cbfbf77d16mr9903942eec.23.1775646851590; Wed, 08 Apr 2026 04:14:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 04:14:10 -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 4/6] staging: rtl8723bs: move rtw_os_xmit_resource_alloc to rtw_xmit.c Date: Wed, 8 Apr 2026 11:13:12 +0000 Message-Id: <20260408111314.19329-5-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: quoted-printable Content-Type: text/plain; charset="utf-8" Move rtw_os_xmit_resource_alloc() into core/rtw_xmit.c and make it static so the xmit init helpers live together. Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 13 +++++++++++++ drivers/staging/rtl8723bs/include/xmit_osdep.h | 1 - drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 ------------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index befe74a1bc4c..249947a7d910 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -73,6 +73,19 @@ static s32 rtw_alloc_hwxmits(struct adapter *padapter) return 0; } =20 +static int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmi= t_buf *pxmitbuf, u32 alloc_sz, u8 flag) +{ + if (alloc_sz > 0) { + pxmitbuf->pallocated_buf =3D kzalloc(alloc_sz, GFP_KERNEL); + if (!pxmitbuf->pallocated_buf) + return _FAIL; + + pxmitbuf->pbuf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated= _buf), XMITBUF_ALIGN_SZ); + } + + return _SUCCESS; +} + s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padap= ter) { int i; diff --git a/drivers/staging/rtl8723bs/include/xmit_osdep.h b/drivers/stagi= ng/rtl8723bs/include/xmit_osdep.h index 880344bffe2f..5b351652e31b 100644 --- a/drivers/staging/rtl8723bs/include/xmit_osdep.h +++ b/drivers/staging/rtl8723bs/include/xmit_osdep.h @@ -30,7 +30,6 @@ extern netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, st= ruct net_device *pnetde =20 void rtw_os_xmit_schedule(struct adapter *padapter); =20 -int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *= pxmitbuf, u32 alloc_sz, u8 flag); void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *= pxmitbuf, u32 free_sz, u8 flag); =20 extern uint rtw_remainder_len(struct pkt_file *pfile); diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/xmit_linux.c index dc0b77f38b1a..54a6d54400e2 100644 --- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c @@ -46,19 +46,6 @@ signed int rtw_endofpktfile(struct pkt_file *pfile) return false; } =20 -int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *= pxmitbuf, u32 alloc_sz, u8 flag) -{ - if (alloc_sz > 0) { - pxmitbuf->pallocated_buf =3D kzalloc(alloc_sz, GFP_KERNEL); - if (!pxmitbuf->pallocated_buf) - return _FAIL; - - pxmitbuf->pbuf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated= _buf), XMITBUF_ALIGN_SZ); - } - - return _SUCCESS; -} - void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *= pxmitbuf, u32 free_sz, u8 flag) { if (free_sz > 0) --=20 2.34.1 From nobody Mon Jun 15 05:18:25 2026 Received: from mail-dl1-f66.google.com (mail-dl1-f66.google.com [74.125.82.66]) (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 879643806B8 for ; Wed, 8 Apr 2026 11:14:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646856; cv=none; b=BkhE4jGZrVmzKK499H+QgsYPgDUs72/9HELoei9XJuT66vC1v2MxyJ3ETqnf4h7qD4HmL9kBxG74UjWnAI2s9qpbr21Nh6a6/CW+nxDANcwCiJhhYGo0DCak/zu8BCsBm+Iy85jAVpSSzfre95neyaSVEcGD8nqysIzCUbHtyBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646856; c=relaxed/simple; bh=iMMCHuUNk205M/t3RiDzeqmOCZFDI8xxxCaYom5FDDA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IPc2ii1htro+7I4w75vcUR2rghLxjq+LNg7h9jOdmkFIxaor6Hftd7/RIout1k7esdT152I5jnigQjFB1DquuPXgzyBEm/Mqu3THKUkz0tGdiz2OUz+xgdAhTeQyZMbdw2eVSJfP3PDcV1VdftI+JYoJQSOocQDreOuw6G0Ziao= 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=aYCqpxuH; arc=none smtp.client-ip=74.125.82.66 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="aYCqpxuH" Received: by mail-dl1-f66.google.com with SMTP id a92af1059eb24-12c0b72dac7so3872171c88.0 for ; Wed, 08 Apr 2026 04:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775646854; x=1776251654; 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=J2zzxZ7T3OrjLQrZ05KQAgPaC26tt2IBs9Eiz7SOG68=; b=aYCqpxuH++TJgMrCLFnUxyzUuTwKlQfK/AM55EYfHe+esm4htycd1P86gwhdSnS2YO ErfjIVsNhJMNOyn1+u+fZT15lGNzod3yiveAOVjDuiIu7+BKvfeQqYsvtUl5KIwCm177 huf3GtVwOP9qmDNJCpkE5bkyGfmXJyfbgGXHHbmfsoi9WCLi9l21q/V8m09RdeyjMD12 rYD7gJNSNV7eZqTYK8C5jIBAFT4NVYJTHlnj6K3zJeiPH9o0c+GNFoztfykbgkJYL1Bv qEJFuWvAtoxRRudI/qO7ud9m/9O/4SqxgeYZgTYwwbs0HqIc0crmKIYm09gz3aFqJJxc I6Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775646854; x=1776251654; 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=J2zzxZ7T3OrjLQrZ05KQAgPaC26tt2IBs9Eiz7SOG68=; b=rN8RaLZT/zpZLJNKAquVvHXA8+oCD5pz1EKrtFssyf/mf5DSDG6k0ACAf9KbzH30KI zQfQc25W6uHjIL5i+YO/X0WccNY/gCejxcqQ1VgwElbKYVjOqxJSxL/p5/tlndOb7GiU 21X66VfNRvmA7OukS6/+EUGiUQ/O5QsrPE9GlkvYx00aLitL3enR31GQAInftTx/sD7Z PX0R+Z8fQ7jFe5HUF9+RanvyoPNn9QIGFzUgJciLagUhlII+isEYFIQVMDNSPsqf68FM UW6eNEVcW2Rp1dFh9MhJ/0Nlxex5J8c3ybasVjUFKoB2AL2tkyN5goJnpN5Lj5DXbLb1 Tvfw== X-Forwarded-Encrypted: i=1; AJvYcCV++1qaEpU0hO0XhMrJE0EFct0pd0eNYLSrUGDbsADxHBKD/VNLfzybEnWI3S6Z65HDGURx/cOg2dCL0QY=@vger.kernel.org X-Gm-Message-State: AOJu0YzcxfvgVDNo6s1/JGNAe6HxYLP5HFisih/2lkXPKpOy2TaUIA6l DdI4CN8gJQWS1mkINDNAnjCFwQ3s9daK4lqvtY02ECeMOqZatFY/brRy X-Gm-Gg: AeBDiesopcklY41ZrE+qSE8xJGRS+bdGgjdP3nfBHG83LFIYm7W8/SStTGJA0exPeC5 pQd0LiFPpj0uLFTw90hKc1Zbdn0S5iNjTPGPl/FR6AMCUFNGY008QeAXGyaCVZKBQdr/Lzyc4KE 0w5Pk9ARN43R5wFqaS/Kbwl5fjDj9Xx9N6JatIhNWyjvP3+sFRTrIuqyMF7LX1XY1d16YZc0kLe ZkieLy4HGMu9kuGR2BKouyNoe13KIXGAa30fec3AFPuc8RdC5fTUhiT49nuftiWxiT0UT2mTqQG 6irxOcaFhxJUWe/5hVV1kxz+HF7QZ7oW6CrPyiM5iVBChyIGwt1ZcReCBiYjjUPmADxDYV0N3+h sQNhhcymKiV+G3cYtZBksv1o4xHuAS9A6Ys1n3gCQLMj2msfWdcuNuUmq7DLcBkY1s2Stm2BHPh LtuV64kbeZgVaoZN9f36SelNUtlJ5vsZ/LSOogloikPtqzhFwoRVkyfKw= X-Received: by 2002:a05:7022:f30f:b0:12c:43:839b with SMTP id a92af1059eb24-12c00438781mr4755345c88.35.1775646853603; Wed, 08 Apr 2026 04:14:13 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 04:14:12 -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 5/6] staging: rtl8723bs: convert rtw_os_xmit_resource_alloc to return errno Date: Wed, 8 Apr 2026 11:13:13 +0000 Message-Id: <20260408111314.19329-6-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: quoted-printable Content-Type: text/plain; charset="utf-8" Convert rtw_os_xmit_resource_alloc() to return 0 on success and -ENOMEM on failure. Update the callers to check for non-zero return values. Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 249947a7d910..fedfc968057b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -78,12 +78,12 @@ static int rtw_os_xmit_resource_alloc(struct adapter *p= adapter, struct xmit_buf if (alloc_sz > 0) { pxmitbuf->pallocated_buf =3D kzalloc(alloc_sz, GFP_KERNEL); if (!pxmitbuf->pallocated_buf) - return _FAIL; + return -ENOMEM; =20 pxmitbuf->pbuf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated= _buf), XMITBUF_ALIGN_SZ); } =20 - return _SUCCESS; + return 0; } =20 s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padap= ter) @@ -179,10 +179,10 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, = struct adapter *padapter) =20 /* Tx buf allocation may fail sometimes, so sleep and retry. */ res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ += XMITBUF_ALIGN_SZ), true); - if (res =3D=3D _FAIL) { + if (res) { fsleep(10 * USEC_PER_MSEC); res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ = + XMITBUF_ALIGN_SZ), true); - if (res =3D=3D _FAIL) + if (res) return _FAIL; } =20 @@ -258,7 +258,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) pxmitbuf->buf_tag =3D XMITBUF_MGNT; =20 res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_XMIT_EXTBUF_S= Z + XMITBUF_ALIGN_SZ, true); - if (res =3D=3D _FAIL) + if (res) return _FAIL; =20 pxmitbuf->phead =3D pxmitbuf->pbuf; @@ -288,7 +288,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ, true); - if (res =3D=3D _FAIL) + if (res) return _FAIL; =20 pxmitbuf->phead =3D pxmitbuf->pbuf; --=20 2.34.1 From nobody Mon Jun 15 05:18:25 2026 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 6FCFB381B11 for ; Wed, 8 Apr 2026 11:14:16 +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=1775646857; cv=none; b=XIdtX4OhoJsRv9eZ8aN+2f0Woh+2kqbpjoaRy4qsMtFybj++84bz2mekmB1WW41tQKIfBh692ODbw3xkQYbud67EmxNINe74N5iQnFVDgDjTTF/DgwgqlcgDK2ua+gCnAM7FXCeB6V5WmI5zCHZ5lm8wUR0GeUzUHN5F/QTFec8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775646857; c=relaxed/simple; bh=5VA39pk5pr3Tb1SspAw3AEa9oD/Vw2bnGrhCZwCJt1U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AXAvcxDu8uirPAeM8A/G5V3CwV5oPaZT0jCuHMwxdwVHHQiE0nmswSf9NT9QXdfSpGHRleioM6RiYKsrZJLOEHgz21k0yA1LJq8TbCxkpuQ9oTd7YNnT16A5e1BPVkUksgvfleldkwI7VI6jrtUY2kLfrnm1cijNpuboetJQkeM= 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=pNCd5xKy; 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="pNCd5xKy" Received: by mail-dy1-f194.google.com with SMTP id 5a478bee46e88-2ce102afb0aso4969703eec.1 for ; Wed, 08 Apr 2026 04:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775646856; x=1776251656; 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=ZCSI+m4q94UTjIe2aTkAkzmMjm1M0fLyMUaJI6Pir6Q=; b=pNCd5xKyUvL3hzYmUP89DmpeK5xrz0KJdlW13tc4+yg0OgKZXTM3J7VPJSSJg8Uq46 uwBCNasW7pJIIHTgR2jqV98p2o7mKbpsRql0JWIIUo7/2a6RxJmeGm0br9HgAyGC4DbS b72sBSxyZX35gM2J4i4W/+Ul96c9rP1lkWJzrcVPEZCcNL8nEvcSbb4lLJp1/B1MgYUN jRmsyDiaCDLuCNB8SB63toayvXc0YooP45BjDrDrY0SIpuk/UQ/asG47r2FMgDL8slwM 71Xi4BEU2PhLMK6UCq1UYfvorXU/YuEIdiJrxj+J+hhxuR/hZF8JeWpoi+PwGWFA22k0 zjWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775646856; x=1776251656; 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=ZCSI+m4q94UTjIe2aTkAkzmMjm1M0fLyMUaJI6Pir6Q=; b=IMbwykEuV+Gx+fPNxuyu3F8dS0561Yn0HRo8SkjiWw0BSiUbva0ONMvAzISLaE5451 iQuhHoTa4r93OnYMAL909n2wkgUy8FmzYA2HQUyBaGarRnspPXQXNdu2wZBcDUfHvEn8 1hcyU89dslCAjvRFolLnIbzsfjqm/4KkekEHH2G1k/jWsq2Kp5BvRGi73/Azzk62wzCE 28pLrQVxdxiQKlMFHD3OBUS4l6Q51IHdrYBqiDWkFxr8OqTOU/O3wobozHLQFmWokzPH szduJOEvlYc5wUcWsTaytg7pIm1yr8awqytRyQI5h4qx4oJPQPLhn/nKydaVCql8V/F1 K5hA== X-Forwarded-Encrypted: i=1; AJvYcCUvFIycQhuXO3FHKyyfT9GYTw2a1/8O6Rw7SdMstOR3fC31/eFTk5v3pzH0p5wZ+XFTsStWqP1dybkAx3w=@vger.kernel.org X-Gm-Message-State: AOJu0Yxa1TSkNTMYxJaJLhKoRzuw3xcrcjrjQy7F5Xlv2Je3vvbz+gcz wqFyuDYe4FoLp71/R3MEQGN5OiempWoxQICnNNSmeyd8/bS4GY8bwHDlyUScxezs X-Gm-Gg: AeBDieu9W/1R6PtajrWWX8IjHd+52tUsttDkSzcMUF/zgmv2Ppcbc4jyQ1EbrwSxxzO 69yixRs3ZctBC76kOkRV+rIVx0sE2bMvvpMr/PsJHSjr0qjKVg51uAsGymXvQgRms70FcSmjb9y Ej7yVV2ZkYD+UGkGliMLff6hS4zCn3Mvmnc3rzH7cDiRp0/SONGri1A+B4ZNtLB99udkZheS30N 6ZyaxW52mYebnFzlbFyBEHqSEJ5KJqkdGCn7RPT+VB/NWY1ezVv54XWm69n4tPJJNyPjWZEUft1 YjAMHBYmqk8UygfPl7KhOrRRmaoiy2wd3YXyqETl4G2N8lSQsMN+RzYKV7eAUBKVCM2Ki41NtGP LfNlj8DB16sS4aq8zE3Rji1mBhOgZWbKJsHKTsI6nkzFewv/LTcp5T+ja3CiVIWIW9XFZly408M o2Ux52XWE+f/8U4SpRz0Vn9w6+Moqi8c9io3NsXAPmDhpMtq7Qtjn/uhA= X-Received: by 2002:a05:7300:bc86:b0:2cb:53f5:553e with SMTP id 5a478bee46e88-2cbf64ab2c5mr10359075eec.0.1775646855501; Wed, 08 Apr 2026 04:14:15 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 04:14:14 -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 6/6] staging: rtl8723bs: convert _rtw_init_xmit_priv to return errno Date: Wed, 8 Apr 2026 11:13:14 +0000 Message-Id: <20260408111314.19329-7-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: quoted-printable Content-Type: text/plain; charset="utf-8" Convert _rtw_init_xmit_priv() to return 0 on success and negative error codes on failure. Update the caller to check for non-zero return values. Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 18 +++++++++--------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 5 ++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index fedfc968057b..c6cf23b9c98a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -128,7 +128,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) =20 if (!pxmitpriv->pallocated_frame_buf) { pxmitpriv->pxmit_frame_buf =3D NULL; - return _FAIL; + return -ENOMEM; } pxmitpriv->pxmit_frame_buf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv= ->pallocated_frame_buf), 4); =20 @@ -164,7 +164,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) pxmitpriv->pallocated_xmitbuf =3D vzalloc(NR_XMITBUFF * sizeof(struct xmi= t_buf) + 4); =20 if (!pxmitpriv->pallocated_xmitbuf) - return _FAIL; + return -ENOMEM; =20 pxmitpriv->pxmitbuf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallo= cated_xmitbuf), 4); =20 @@ -183,7 +183,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) fsleep(10 * USEC_PER_MSEC); res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ = + XMITBUF_ALIGN_SZ), true); if (res) - return _FAIL; + return res; } =20 pxmitbuf->phead =3D pxmitbuf->pbuf; @@ -212,7 +212,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) =20 if (!pxmitpriv->xframe_ext_alloc_addr) { pxmitpriv->xframe_ext =3D NULL; - return _FAIL; + return -ENOMEM; } pxmitpriv->xframe_ext =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->xfr= ame_ext_alloc_addr), 4); pxframe =3D (struct xmit_frame *)pxmitpriv->xframe_ext; @@ -244,7 +244,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) pxmitpriv->pallocated_xmit_extbuf =3D vzalloc(NR_XMIT_EXTBUFF * sizeof(st= ruct xmit_buf) + 4); =20 if (!pxmitpriv->pallocated_xmit_extbuf) - return _FAIL; + return -ENOMEM; =20 pxmitpriv->pxmit_extbuf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->p= allocated_xmit_extbuf), 4); =20 @@ -259,7 +259,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) =20 res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_XMIT_EXTBUF_S= Z + XMITBUF_ALIGN_SZ, true); if (res) - return _FAIL; + return res; =20 pxmitbuf->phead =3D pxmitbuf->pbuf; pxmitbuf->pend =3D pxmitbuf->pbuf + MAX_XMIT_EXTBUF_SZ; @@ -289,7 +289,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ, true); if (res) - return _FAIL; + return res; =20 pxmitbuf->phead =3D pxmitbuf->pbuf; pxmitbuf->pend =3D pxmitbuf->pbuf + MAX_CMDBUF_SZ; @@ -301,7 +301,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) =20 res =3D rtw_alloc_hwxmits(padapter); if (res) - return _FAIL; + return res; rtw_init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); =20 for (i =3D 0; i < 4; i++) @@ -313,7 +313,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) =20 rtw_hal_init_xmit_priv(padapter); =20 - return _SUCCESS; + return 0; } =20 void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index e943dcea1a21..f4214608c4fa 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -636,6 +636,8 @@ void rtw_reset_drv_sw(struct adapter *padapter) =20 u8 rtw_init_drv_sw(struct adapter *padapter) { + int res; + rtw_init_default_value(padapter); =20 rtw_init_hal_com_default_value(padapter); @@ -653,7 +655,8 @@ u8 rtw_init_drv_sw(struct adapter *padapter) =20 init_mlme_ext_priv(padapter); =20 - if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) =3D=3D _FAIL) + res =3D _rtw_init_xmit_priv(&padapter->xmitpriv, padapter); + if (res) goto free_mlme_ext; =20 if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) =3D=3D _FAIL) --=20 2.34.1