From nobody Sun Jun 14 20:03:52 2026 Received: from mail-dl1-f67.google.com (mail-dl1-f67.google.com [74.125.82.67]) (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 CD44B3BA237 for ; Wed, 8 Apr 2026 10:45:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.67 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645121; cv=none; b=BApBgKp5q0ChnUkxhom3mxAfqmxM5oZw93m/gH5MVQwArsUl6HynG8lAM5cVVxzlseSkZU4NpWh8vhKfDPB0WfRAMEXzpUlGSFBTmey9wcHTUxMaAePj77YwuU/fERX1mAJTCxwEsDT1piemAjYe6AezlTy1viyXmr6XfGaR2lI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645121; c=relaxed/simple; bh=LrjH0db+H4xacV1aL7fi3b+fr4AGYHV065KdoaKvxn0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RN1iU4fSs9hcsyY8yVEKS2HxxfHcbLnv+iHnm4PCNo5e12P+TUb62Zn4L3RICPuzmyTsP71ts1T/V+IENc2L3785Srn0Ia6xvc1b4sh6vbUpzecxV45SOvPcDWvI8QumSsHHRkiLKNwHLsQILQ0MupIvI9yQu/ihzFl1i1ZJ80o= 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=rlvhHYip; arc=none smtp.client-ip=74.125.82.67 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="rlvhHYip" Received: by mail-dl1-f67.google.com with SMTP id a92af1059eb24-126ea4b77adso7181152c88.1 for ; Wed, 08 Apr 2026 03:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775645119; x=1776249919; 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=rlvhHYip6MjCntH3ZpQolunXV+QrhLGtsSxTrKLj5inZLgMBvUOMc59PoGkFuX+Skn ve+PAmGkUFVR2dvijAZFtSQsUUVb8++xert73yfWKTRASJuYhv4S0lzt6QBCgkv7ceI6 PJXlrzioPtpKZgkkVh+pFHiyzW2yiuEk9hIPWRR+FCBFUAueKlF628z5VJsvT5QJdHN0 M5VW85LdxC5xdqTmsUpF50VsVN8WbMh1uHzn+VBX2sOa2q2FmOZy1HHFYqt40/gnPBay +12TRNTkpnYjwozbJd25lXx7MOkYVzWyyWJj4aBFJXr7zRZs4nc0P7O4+wOfHYXT1ruH fGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775645119; x=1776249919; 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=sDSJ/kj24uBfvARSHerBXJTWbpD1cYDDAYlhigmrrDVaJgmTd3KinmjsGCBQ2s7jUb BhBASWVeNa65GWpRnFDr+qLmiaHd9AptW9pVGjCi8zJSkHzo6y9rfandEFi+0YapRHJ3 SKzEJsFXzcnvf5qDOnVH/9LneniANAYP/wxnxpbl3/DXWxLgx0mtCuOoJkRB6O2IcJ8F g1aiuM1+fGB5vLDDCzXCIogcaUq3efFrl8mE2FvzSMF6BunSUvBcoyReq8zrUYZY66uN au/TOSAz5qEpDiErh1NGCj7WVubES5Fd/bvt3Ra3kMNTK4Dr4pbDpBOLmbfZ9op69B9y d3MA== X-Forwarded-Encrypted: i=1; AJvYcCVN1uPomWvbkGqHXemHFKJwKv1p+KvNa8GwcSar0Sp41SV4cqqhXkEMrupvvqnNLR1RbBE05CanjuWnw2s=@vger.kernel.org X-Gm-Message-State: AOJu0Yzm5Ysz5nAaLSoglYVUgfeyJwZ8qwyVbK3xsC6NHUlBFxWeoahy S6b6laeRfbe9nRd7vuE+o3lN3kNcul/4WJLXx1SVnlPSeDxWOg0sIlkB X-Gm-Gg: AeBDievCCAP6YkKSvs4l8WB6v6Z7xaRp+jRT183OGzs8whSZ0NiOSVmu/f1rMXIFVss Q5MV30GpMZQct6NX2smJnN5AuxlLKt3RmiK9GerdmMQTKf0jM8dTdzl4ocw6Bq07VuKA3K/2bsR ofdXRlFeTw6DBQwbMsuPI8f8MZDQyY7YCmS7jbfHplGyDjBNHCjKtDM14FHeufOJASIFyQZbHr/ jSr8M/R39ZaFDKDeIQU2egBH9Y2OG3i/iGnyd9KzexqbxTRD4uGSWkNOe/cIhefUt7VcGSVl9n7 NhyqmGlDfjJA3aJYPnmVMBEpW5ELoeV/EyZkntib7RybB+AdOaxHO/Yi/IR9LO4UFs2wHnuR781 VTf/oxX43hqT+6lkLxVwLBzBWIG/OmBQHTNUWpDXZS5ej1iv6VATvkzS49GbPI6HnWZ5SW9sMve 5WpWDXNZSND0/c+w4RIWolmvWdDVbTiakR89k79o91LpHUqq7ZUUtaPjM= X-Received: by 2002:a05:7022:6889:b0:128:d786:8ac8 with SMTP id a92af1059eb24-12bfb639214mr9528176c88.0.1775645119021; Wed, 08 Apr 2026 03:45:19 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm24417783c88.0.2026.04.08.03.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:45:18 -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 v4 1/6] staging: rtl8723bs: simplify _rtw_init_xmit_priv control flow Date: Wed, 8 Apr 2026 10:44:19 +0000 Message-Id: <20260408104424.18952-2-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260408104424.18952-1-dennylin0707@gmail.com> References: <20260408104424.18952-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 --- 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 Sun Jun 14 20:03:52 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 DDC923BA257 for ; Wed, 8 Apr 2026 10:45:21 +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=1775645123; cv=none; b=rbKzDAiyUrUPkYa4uaoSLZm3gKAxmsdlgmIqdLsGIZla9EfLTmPiae55sO1bGfPOHGhX4k3xOuW3qs32Dksdjtkcux57BhID+SMfmMx8MvcBEjjPEH1rto/x8/zWtq2Y1ocIw3GUJRq/MlGx/qVIBL8aRN+bqvxyH/OfjVCKftQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645123; c=relaxed/simple; bh=UKGoTvygU9/qk9ny9Ksdv4RHhLzICwFIrRSmxE3H/bI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qPFgKTJjTI/bpy0WUbV9hUfUFggH2NOYMvELMKgbLoCmiW+DevG/xTE2kWnd2G/ILSGQnYYb7qfMKrQ3Srq7vvY3NtEV00FyhzS39/X35gprTK21j7zXj/V4EruNeTi78+ZaVFhYhfBC5gT59U7aUIz8Olye2+x7HyjjWDl+Q7U= 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=pfNRjTGl; 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="pfNRjTGl" Received: by mail-dl1-f66.google.com with SMTP id a92af1059eb24-12c2575ff49so569961c88.1 for ; Wed, 08 Apr 2026 03:45:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775645121; x=1776249921; 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=pfNRjTGln1BgoSPJk78kAxpYJdSCNqff6Ka7yrIs8c3vVcTuH2Fv3AxsMk09Ek/Rf0 OdJLQUYrggjSErN4ZyVG02NJUHBBhIflm3MEdfThQ/u4jygppi7YcZ8yBGPe45lRXz5N d5gqoFM2XB2RTdJhG0ZPa8VhnzLckECYKBT0rjLHCv+wGVMVg2848Bb/wSKKS93c+pFP 4tnoolOLfQ4E8z6qqykD3IG5cR6NHJ5QRtQ2/c1jOznoqCaEGycWOOtuFKIhXrSnDUpy +8ZZDRHECdp7422jDdjK2+2BL+dy/uFoSQKxPDvO2LY0263hC/HIcNDwxI4LMlKD0pRO jWUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775645121; x=1776249921; 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=jf0CCBtDXxLepDYEBQHRumIjTwPt1/ba/wvfn+TFuXDzGjRmcOyV5bpJnN0QT+D1I6 w4pnETdkLNXcGNYsL3kRPFwXFB+AiVyg6EjmlsHxnIXOqlhsUVWCI6UKPZGHYUTy3bMy 4uDruXNp060hQqGQ76Vgaqn6/zHHmKXkB0FrlEij5XWeiqHO+A90oysmFshx/WuwGsbx 8J+A4S+TZlkWJjzTtaK3Mr7OxWnEiEAJNoiV9UxcMEpe4IpXycpJkix1KEo48YaDy1MA LGiswF0AvYxin3hVfL4GB8V82jay0Q16vgrZX8UfV3YDowT5wghudify6+dDATEs/uJh b9WA== X-Forwarded-Encrypted: i=1; AJvYcCUoHgVFdWGtCWz3cCmEgzo0xXTquXgD4pg6+9MRdsy9k23j5h8ViDexqbv9FEgtYbBvkSjw6zAQgV2mDX8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1un1SCMHUEZrnayBdW17lOdLBQLf3DFW89ufDntnlYyBXwZSh 3SKC2rJ1OEhK/OpM0D73O3FL6B5EtiWEcXee0zFHdJXjXKzNjLDeiyOO X-Gm-Gg: AeBDievLAg9fcYXzM6mBOFp4BMxu7V9wcXMZUqyAvGSOtiQ4tPzljRCmBMImkt6PUjc kCsAsfiK85RDMZFFJn9nfohfw2XKpNFag5grvY/ajmHP/c84p5p3w9bFyP6qM1vgzhSB6i9MT2d l8JM26CU1D2rP4ObakibggfnGHOw+Wso2qAU15qV/RJivnpjoxMVJn1mFkZal64vZSiob0bqGJj Pcjh99V3Xm4GRonRFGerpPZwh8GBfRI/AF4r5/XWG29lnvbD2086rc7HXHH/vrTt0qgfjkJT49s S1Obub1ykaeuaMLNrPqA45zso8iSukB3siLa8+mhdRhxDK1KJofCB/xNC7e+E/fkWnZtk5MP18r aczd4TC71MsVicrOe9kPRXycmveBQq76AqqwJyURm2+64JfjYBCfW5z1A0HDhO9BlLcm3EYzAhD rIPce0A4HydVrKEZaWc/LzPBZKDPKO/aZfWVgzo+M0t+y1NfIhDBNHSsw= X-Received: by 2002:a05:7022:10d:b0:12a:796b:7cf1 with SMTP id a92af1059eb24-12bfb7458c4mr10111211c88.23.1775645121118; Wed, 08 Apr 2026 03:45:21 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm24417783c88.0.2026.04.08.03.45.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:45:19 -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 v4 2/6] staging: rtl8723bs: make rtw_alloc_hwxmits static Date: Wed, 8 Apr 2026 10:44:20 +0000 Message-Id: <20260408104424.18952-3-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260408104424.18952-1-dennylin0707@gmail.com> References: <20260408104424.18952-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 --- 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 Sun Jun 14 20:03:52 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 C1A183B961D for ; Wed, 8 Apr 2026 10:45:23 +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=1775645125; cv=none; b=gshkZNoxilHw9jSxixmr+hdnCchjp7NQSNbywvah3XOwI7rprhewnC4EqvWaPdjE7kZNmGivBMBrIMrjD4pco+OWrV/xhmAM4Uf5/QW+YPWnMc5NLc7CVNgBY+V5Rvqpp4hDaEdFE38lV4h2j4iEXUeuD6cAjKRgoAn25rc29ck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645125; c=relaxed/simple; bh=gqL8rrjQX2MZJ8p18pobOq9oxiN6UV6V5gJJZGg5tWw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N6ORw3DUT50VI3pB/6xVa5pJbhTosvoFvHr1EebFX62AH9dgFe4LhdgX7RpaICjS2HXD7SLyocMnqpvwluxnHBV3z+LyXCm93WhEY7LveDRJTF8Xi3D0VNYZrCNLBPEQY0bgpnDrpQAu2J9mtnFba2hz2r3saZ6+KzPRB29G82k= 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=XiY+Rd09; 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="XiY+Rd09" Received: by mail-dl1-f66.google.com with SMTP id a92af1059eb24-126ea4b77adso7181200c88.1 for ; Wed, 08 Apr 2026 03:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775645123; x=1776249923; 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=XiY+Rd09SRFnQTkx5C8wVhiIcParQfb4ZH13zmGizYxcTQr/5rFhVyNfEnfABbGdjs OJyPPi+64SlvZnhF49dkb3A4CS9zssNCIhGOewLKVGlsidVmpImzCcre1oKw5XCGXfdc lGF3DjqwLaGyScsGl0P2hkkewxGdMOUypmGxhPh27LiS7fUtsl1vO/DzSPQ6LSN6M+tj YQjnDz9mDhM9wBinPjh7vemsyBX2uQYK76VaGJhkcRoRtu3/y1ya/Ll3iGw1sW/7+AL4 j1L5gX6ioDsDFpvun9qQ3+CWxzLbM64o7dhnETzZufz7i82E44ae8PNRLVF72AGWPdgz ik/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775645123; x=1776249923; 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=E73IWtnvGV6S0mAaXybZ5v+tUoqIrFDr/6xghLsrDWyySD0QI3fO2MLFKMhe4/46j+ U30nn+MhDfv2M1cWTasEKYhupm7Fc5dJuJHVJiXCvEqlktUYkgHi8hj/j1pAKpN5Q4yY ru27bvWGn5NumkixS7mHe22XC7AeTaPdoFexJDlCKdEVIxfEs8x07yj2/092hvfEbMCK ik9bsjmffdamd9bDilhdTeEXO1PbOWjoYjzKHRV4lzWk3fWvl+C2wokAMbsoRO2JUpZD jVMPNbgX64F9NYgSVx9LDvH64d6Y/pLSfyFJW1VOw37bANjZkfxV9iUffNdxpqi386hw JVow== X-Forwarded-Encrypted: i=1; AJvYcCUR9qLclwCJEs+dU73SFlYmsgDeLAinJpq563ISEJkaxFEHLDVRfJ+zwpwQxoh72J+77ZURrCJk999A2PM=@vger.kernel.org X-Gm-Message-State: AOJu0YzzHbGSjbqJYuZPS0GUM9oQmlfOAFhS9Xsg8pUMzm2s0JUyLF1M gB6V6R156PC+kiEVfEbSoz7OoNlwgGdPfzpQuw8tOwmv/nBF5kAvu63O X-Gm-Gg: AeBDiesLPoqGoA9PxAWJXtdLvi4tcpL1Su5dV5s3+/NDcz0RSEcBK3vMma8OMydZndZ z1elLeW2INTL5wjDbPh0Q8uj3k6tV0DmzZVgcWirWjVjqwxKai1UsqncKOGBZlfXYJtLe5RnlX4 i8EUxnWC03pm0B0tb8TNelyogqmiJq7y5hXMB8r6ncl+o7Rj7i41yKv0PtfNL4YlqB2vCUMbYg+ v0hyBXO+aF1gnDI5E5KfZ3dIRxXsO/+svkUB6lW01creNGaiPzr3ow4BfbVofy6VoHoGBdaveG0 PnlVvSwi3a1R8+yc6oOZaa1YqJKVDLYlX+1S2tpsc/dNiaNQ4p2Zt4hBDKEeTfMYFwhW2GjbJKs KFK2zT51GqPY8sEVtiHCNFKqesLtXMDjGzwOpCHeXHtRUkZEMPG4lUR0k2A/op2PqxZNNlnA/af P1EqINpjF8GiYVkC1h0+9A+ClQAIRSwxMpX7C/RIZ8HU/kfhXP6nqybq0= X-Received: by 2002:a05:7022:260b:b0:119:e56c:18b3 with SMTP id a92af1059eb24-12bfb775a39mr9622935c88.27.1775645122888; Wed, 08 Apr 2026 03:45:22 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm24417783c88.0.2026.04.08.03.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:45:21 -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 v4 3/6] staging: rtl8723bs: convert rtw_alloc_hwxmits to return errno Date: Wed, 8 Apr 2026 10:44:21 +0000 Message-Id: <20260408104424.18952-4-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260408104424.18952-1-dennylin0707@gmail.com> References: <20260408104424.18952-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 --- 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 Sun Jun 14 20:03:52 2026 Received: from mail-dl1-f65.google.com (mail-dl1-f65.google.com [74.125.82.65]) (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 961223BA22E for ; Wed, 8 Apr 2026 10:45:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645127; cv=none; b=EgEKgbUFWGGzfsF88k3/Li6eVBX439c1ywfS0Wx6RwVWc7gT9oUsMkGJ8sYFlRu4RYFBYbfwPeindD7wenKvRJEeFo9GDTjfltnyr7lEolQCmBDzKrLhmccPBIRlseBlnCoURWgSRLNarpJVz/jaxHyBb+vCV/Wr44QjpgugWMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645127; c=relaxed/simple; bh=f0PR34TdvdOJrt1uwL6aSTlLoYOFX2Kguotwc5bcPbQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y/2r+slvlEK9Ca/bHEgZBlae5QZ5VJB8oU0Fwrctbdf1D/s3Fsy4SHbo4CpNfV3WiEPiXiEsg0881VTVlW1FzYkC8SAhZ/XM6MnPecgP3VquvX0JzoyyVzv5ESxK8zXPNxSkDyRpzcooYDLn/u1LUn9FHqEAA7SSexR0vNzq4Ec= 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=C2H1FlgI; arc=none smtp.client-ip=74.125.82.65 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="C2H1FlgI" Received: by mail-dl1-f65.google.com with SMTP id a92af1059eb24-12732165d1eso8428631c88.1 for ; Wed, 08 Apr 2026 03:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775645125; x=1776249925; 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=C2H1FlgImsNAnEQmhfm2J7Cxx78ozmJP0ii79zpPTXsO+UAsLIMRuTx8rqzgH2+Obx wqFFkRKZ3Z+YJ78MNmUIzL7RcvZ3vDkzuw7leO29md3h0WhtMzDhRzBTnP+3TPHEZKGm l4x5/3T7j1BlVXctBWbCm4xSTppozFtLxwegJvmDZ9/jAjiYDmg3Gvk8WG0HqTrf3Tey sHEHEekv86fAERBcKFuVFjbF/v+P/hTM7TwpdhiVEWoZpUcH6sG+/jk+a6dwv6Ye1X2P L30lt9KVjzUox5JeRFvu5+RWp0Mj7qeEri9Y0b5rqZPVYsucfngR2ROqW24zKmTY5srH cLXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775645125; x=1776249925; 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=J+f8duR6vL/cCQOOsgDMHpDV0N/fikXwFFIpEoBqTnJNIyjhXTgfXxCShVFavGFIJw ms59ELyTK/EpNBhfa+QfnEqJ4krO1qYbY6FUb4a8W+gtmMJXL9t8kjMcwOa4ESz2lXLQ 5OyPjloNrGhfWK4/yz/EEKFqx0p6+lVxUfVQXxWka20f8MdEr2GGJPWRemJ/mcpt6KJV IQNYwO8fvjCfIddkqQrzri6TGEhxjApmMrMRUIOWWxEH54NJkI/aRYvRa9ddzoVp5jWr 3brL5YYLLieB1/8geXjPWCs7xYIUGu7pQoyz5dhv0uuFKvJ7E5FaBiqM/6gAQul75j5Z L15w== X-Forwarded-Encrypted: i=1; AJvYcCXQw/MomaRhscbeLRlxcGIBKAn41IZx2kv+T6VjAXKmgLzdel5E9Cn1D70zNEXqeSW3XOX5z+aiYfI1rqI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxh0t07aqfzUWSSXzgTbJdsZsg9XMvwEJrOYT2om5m5epFBuZiB chTtivQ/ehZyCFosi+rECZ9xr80/tVhefbGxuaVIyGoG9w0FJfKmeo1x X-Gm-Gg: AeBDiets24w+JVAa3p+OBCJUrs24LvR6wcAJXj1uiWM2io/cL/z+nHzgg3TJ8M6rPi+ Kn9gSDl3vb8UPQ3SfsI/Mqo3D2MMRu0ZM0pZCxvZ0eAuaAgFKYvPjDLrtBg2AGexeovqqFGBtNz n4xjV3jz3v2qEsZrv+5kYjgUineW1uxS5+MEMbkZsQHcUH4/epGkSjj9QlmmuKu4Kjr0vDVMhwp CXtD8vmlQe/Cpks/rl7l5CNAeczg5Rhl4r8gdwsMKB0oSHx9WgM58lR/xsEJYhmTscDrdXXJckt fWuCK/1Ej0cRHQ8/ML7/MwUNPXE3kf84RrOvwdSK+V7JPf0hSGC7gf0xCUKwZvRw/I5gYDOYosJ hcLctBEWq5ZikasMvDY8EL3DZ3frdWO5WzccPo2nY0hEjwlsmCPFnWU44sEiCWBkK72S9hHLTxP WfJFfU7bBFYXNLyMmcApb8aiv9iO8mH2sZAQDMHXiexiDe42ElYx4CYYs= X-Received: by 2002:a05:7022:23a4:b0:119:e56b:989b with SMTP id a92af1059eb24-12bfb6eee73mr9293876c88.2.1775645124550; Wed, 08 Apr 2026 03:45:24 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm24417783c88.0.2026.04.08.03.45.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:45:23 -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 v4 4/6] staging: rtl8723bs: move rtw_os_xmit_resource_alloc to rtw_xmit.c Date: Wed, 8 Apr 2026 10:44:22 +0000 Message-Id: <20260408104424.18952-5-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260408104424.18952-1-dennylin0707@gmail.com> References: <20260408104424.18952-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 --- 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 Sun Jun 14 20:03:52 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 DBAD13B8928 for ; Wed, 8 Apr 2026 10:45:27 +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=1775645129; cv=none; b=JEZwPa2PAm/zdytt+Kic8W+XJKWjSuRiah39G1RiEGCnYSqD/2wzHMDgc8xIO05wat4EFZPfGqUYHLDTIkGkOkWaGkQkcRVUqueAj77K9Sr875hSnfQz3CZ7y3UjCTxMaDrl1h2T+Ge8yZ5iGtOSlgEMFiUIveuPNX2Nnz0rDpM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645129; c=relaxed/simple; bh=iMMCHuUNk205M/t3RiDzeqmOCZFDI8xxxCaYom5FDDA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C2Id2BlHxSxAH4+hO/zeoiqNe7snaJtVowcHKZ1FesyjkDRpOG+5vZHVnuEvEwKM92rxiya7F67m9FpdlKNK8h1HkajH477vvW/NICh+4/OOWd9V3en7DM8oZ7qoQCTXSjfM4zQdbADOv9XDiJBzze+WYohF7zhVA3SH1yADDL4= 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=mvZJ/EBF; 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="mvZJ/EBF" Received: by mail-dl1-f68.google.com with SMTP id a92af1059eb24-1279eced0b9so7433488c88.0 for ; Wed, 08 Apr 2026 03:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775645127; x=1776249927; 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=mvZJ/EBFUXEJfL1jsP1UvzDM5aEev8aInk6F8QrI0Qw2gVvOXHdsswo9kB3UamCU3W q6peoikU4CWNmrdfh0igyzS1xzbPFop/dxEZ83XjN3Emp9SLO1L45pBcXxA5oizXWYo3 MRMY1u/+AuIiRF+jtjpGw7j6sLhkLhOeC8LZjdW5q0DkKz12Cay9ndDr/IFkVRutHNHu wIJQ4wAkBxXp9monvwMErDLD6LWvFoCQ7cojUNq1ebSqhNCyo7r2BAih86u/Xn+KQZ3t rdOUUcT0/OAe+6XAVwITwSvC1m5Lw2gh7djKaBnUz3hus9RnBRTp8EagjboIdYxgd3+f sZ2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775645127; x=1776249927; 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=Gi3Sghvoq5GGSJAXpvGMBrBYiF7o7ktJPsaQogjjb3Wevtzfwva5L5xvzd9N//a+LY 3GXrn5r3HwxiXr4l1g8pn+r9FdG2aKumD/3r9kMaFfjRjkd2ckHKTtBiu8CcVWl3lYZu Yq89foj4YZiVuogKYmCQHwV35XBrjN7TEr5xnnj24e7W6VQC3lnKcUfdR+PLrQ/JvV3T xPEmabBe235wBNYzF3riSXZHJYX8gY/1XMgL1Q0Gmd+ymkJT7IwczfQDZ20sjKHVPmzB 2S5Vyf4KARBf3RgePymymdt2KSI/7PWmvyZkaPpP4XVpT3ZWJ0cCx5wCaq8cKdooxMBY r5kg== X-Forwarded-Encrypted: i=1; AJvYcCXNnmQ9idScwmJMuhxg2RSpekzXi29EfZHUiU3o9oIyIOV5l6hLegqgqqYParnU8BTrc9hveZ+6ZzFVBzs=@vger.kernel.org X-Gm-Message-State: AOJu0YxeB4BPAkbe60bRm0FFHmBwoR1R0kecS5BlqmtBKX2ZkobjRPFn 9S/6rlWzThi22lHS3JcOgxW71MJNObaTKWld/+42nv8WCPTyLMQY4EAA X-Gm-Gg: AeBDievjjg4HSpyMOapteamZSpiAScn/ihvdiaoE5iQ7c1+bBwjdAnqmNpkX3QhLvAt 5cUhzRkbDC5mF+ShWRu5COxvt3Rxwa6P+4lfpWUXvBPTNFBeYPYQNSnGEBK3MNhv6v4rpiEPzFR cqiw/xf9Lkva/B8Em55DYERQuZd0YnYuQy79wnWoL4nv+l/j6mLTC/EiHuQgzFKbboO+hrVtRPW /cQU8TICkYQrVYoQX2vlIIY5IsNxYO9Nn87zsrOOzjUhXtogLCS8r3i8m5c+F+ah+SR4n5YJQ1H 7WJsxf6XBHtyWsd2GPVmzcKnHB1JnfESazPbbFo8rZ4ptz3EsqacEqqqvS9wfuca2EXU9RX2s3P fiWbx00ks5em2rZHKJdVPBTFEtKJmvxTA/hSeK7TLhsq+6bROUCEYMXPeeclul5udqaYt1dkV01 jWxxfYf8EHtqv24hy98xniul9BNpJ9zQzqR477Gk96uxFhOzs5AH8l664= X-Received: by 2002:a05:7022:43a8:b0:12a:6f8b:36a3 with SMTP id a92af1059eb24-12bfb6e7d0emr10243186c88.6.1775645127044; Wed, 08 Apr 2026 03:45:27 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm24417783c88.0.2026.04.08.03.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:45:25 -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 v4 5/6] staging: rtl8723bs: convert rtw_os_xmit_resource_alloc to return errno Date: Wed, 8 Apr 2026 10:44:23 +0000 Message-Id: <20260408104424.18952-6-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260408104424.18952-1-dennylin0707@gmail.com> References: <20260408104424.18952-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 --- 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 Sun Jun 14 20:03:52 2026 Received: from mail-dl1-f65.google.com (mail-dl1-f65.google.com [74.125.82.65]) (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 61AF43BA256 for ; Wed, 8 Apr 2026 10:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645130; cv=none; b=tvi41vYwydapdw5JNZUW1eXulMVpmMOx1pAWFGasrK8grHf8xcMgDsKZGU9kF8a/O5H4cg+7WKqq72y64jwpjaBtcVv92FNyx1oHXdMa6R2VP3dB36bzjJi8Y9pt8K8We3vukuYZFQfuTLO4PghJPDK42amxIzEsyQIJsWqUla4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775645130; c=relaxed/simple; bh=hGg02QATHkkke1bjuTer3z11aD9JCZJAEagAsXT3E2A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=codkxTmCBb15NWeD3Oz4pZrCgoddkVDQfOQ+iKRqRvX3/JnlnLvqHNyMG1R9QygywJXF2zXKg0SO2bJnn7woT3FFR4y9I/RRAGSnIejoRj5O0wwdGEHsTscLIyJlBT1O1KSNELD+JhB5Pn3xkWq95P1SAOomo6c4NSs/DnIzGJM= 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=kvsBmLq4; arc=none smtp.client-ip=74.125.82.65 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="kvsBmLq4" Received: by mail-dl1-f65.google.com with SMTP id a92af1059eb24-12c0b72dac7so3841542c88.0 for ; Wed, 08 Apr 2026 03:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775645129; x=1776249929; 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=Etrgohg7PjyPKSflB7uJ/+hYjM3wfm6/HkFN+c+SMaU=; b=kvsBmLq4KaPgAMXy/9224fEWvxyK8YRkfk+6/CNP33Mmd/G3zZFmOcdymng5Fziqff hHuTsRZTDm6OoOQNgacjnnGw414sRZ1g6JS3rPPu2jOwW6mft8MC5Pyu/F+AuBdfMU61 l35Kh3tOpACNQ9QHO64C6X73ptMnrT53eQoV5ZEm/5f2tFH66q6jf0Y1mxhRPBx3ZCVv A/CpIemT3D7X4pxCwGQt+oudnUGgv51ptxR4V5N0Qg4WliYpiU1efu/5u2g3jOovrReG MaUXbY6rLONvar/y0CSXR3pWY9ypWpOMxGksnI10UH7q2fB128Wl6Udb4UlkqbZg566L TKmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775645129; x=1776249929; 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=Etrgohg7PjyPKSflB7uJ/+hYjM3wfm6/HkFN+c+SMaU=; b=Y9UvJ/dmEWlG8YCvlRYBxTTuE2f/AFqJHuiSVNWJNbC9T53GWscZurXM1CDG/HT6nL 9CSTdKqj5Wt/cO860A4avILudU3Cf1pALlUxNu72J5GBoL3QP66jl5hJkg0JHDSCN2oN FCppMSSiSOlri/rMhq5Bx2CIKlqlokzGL4lk9aiRopXOX9HIDtEot6cLvdrmbS9QrQHF Z3vbkI6ks1dZZx4gtrtvjp4a4Oi0N3KripAs0TJ4x6bf8hTlhLBkeA7wiFuHoycpL3sa KYXA+d4+8SNcUdvcOEpQiKgm1fMfpSGqDfN5zUEeis7d+58luSMVwaZxbN0MC8/fRw2S vrmA== X-Forwarded-Encrypted: i=1; AJvYcCUnEQFbxEGWVKz4Ddp8TBTQRt8c+0y8mINfxrh95nhG9x5WzjWULp74//+dxZPH9YNiXgZyL+eKDY9jVO4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyjdgg0DvOwvCc6bPPpjEG8dQv6LnHQRYUyYDkci8tFcJtqzgNr YzyauEopNunyj9TToH/KQ/DiU2XNylKxyLEGfY/6eH8S+NfNKzasENdu X-Gm-Gg: AeBDieuX/NKv1H3GyXvcYnYttvDhTuXE1WdC9HHrnkhbF1easvIQG0z57tPEpH79gBV M+tGERycvbquU1+BtX7MWClCP28+IaeXHrCyL+hf1S36n5aTJR1tTiI/EUuOAJirByWwspQDfeD 0uDl2jevD9+Tz7+ydkd0tQpliPdF37XP7ajw/e//3R0X0F8CLszZEgwSKjE66OMQ3kZeN5r2s0E X3i5lB6sR5CYwhZtDV0QTzpR5pXoG7YE0qFhqYwB2Y3UfPYYvk9dEDk8rfPU4xkYrHUWo/e0FyZ GSnh9wEumOJKx8F28YencBNF8L6Ua/zCt2agkRiKPgaxSGVgm3lFDGWj+4/WAzfk8v83FBIKHJl 6bGEYVKFFxM8R4XslmXYbGBadA+wTQ70Kq3uknX4RS+uNebPZqZwpDLbIGoKJm6tTFub7vUyx0H 6aRYIhBHPhj7LTgeL1NWpbQBXAOH34SHyMTtNMrpt9aMPukaw7o63A0Kw= X-Received: by 2002:a05:7022:212:b0:128:d24a:a5ba with SMTP id a92af1059eb24-12bfb760956mr9431635c88.20.1775645128604; Wed, 08 Apr 2026 03:45:28 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm24417783c88.0.2026.04.08.03.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:45:27 -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 v4 6/6] staging: rtl8723bs: convert _rtw_init_xmit_priv to return errno Date: Wed, 8 Apr 2026 10:44:24 +0000 Message-Id: <20260408104424.18952-7-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260408104424.18952-1-dennylin0707@gmail.com> References: <20260408104424.18952-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 --- 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..930122275a8e 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)=09 goto free_mlme_ext; =20 if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) =3D=3D _FAIL) --=20 2.34.1