From nobody Wed Apr 1 09:45:46 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 4F30F41C31D for ; Tue, 31 Mar 2026 15:33:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971197; cv=none; b=b2JPgLY7jc1JNYWyIHsBZzVZFKsSkCu6dddG3rqd+yMuMXWxepdHRnzfI2RMdoE8j7MkuEda8zpuX/YK1SXEvlEGGmfo6A6QPIGas0uzAOjLBdkBYpCVlLS0JWS37qLZqhAZZnEYqQSK9VGr8fhXbJlWEPTKewA0rGaJBtpNUdQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971197; c=relaxed/simple; bh=TtQ2GqKrVJlkDKD9m04qBC10J5egInIEBw71Ss4M2QM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mo0WQiZrSHi/etwaDeo+P3S9jImPTOJHuIatqSYFKohRCc+WKB5fcxPsidr4IzCMEHSSj4uGKd6qM7t3YhOVSNqnXt1Ji4w5GjHT2NkLnD8p/rMGBhSImk4He/CT9HAnbNG4s9eUvRfKJEmUIX0bm7tUy0G0UUbNcoxueTOfHdc= 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=fWZFBOLU; arc=none smtp.client-ip=209.85.128.48 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="fWZFBOLU" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-486fe36cfabso35569445e9.1 for ; Tue, 31 Mar 2026 08:33:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774971184; x=1775575984; 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=AFyRFKei9suLL4OspDT72haNVF/dIBE9vkd1iIbltuA=; b=fWZFBOLUM3XIsqpVZKY9B2zaOUMFNLr8ZIMNHPfk1bAJAIk3O/CxkQhaEnAszA2HEX o7daUIJXuQWJN9mzeW6TXnYMiV0JDoa1pYpZeokHGPp+dnHjyfjl82GwT9S6GRcqcSPE O1qSxdaj57HXwSU0oVUqEtZ3hZaAr62c/+yceZs8R/bggNYIo+7ejpQQOwtWGhwA4Sky B5eiCYJ+wpP2B1Vp2bWSpiofwq7UXlbB7OBwu1Gf7hsFobnj+LE38gyVnRnJ/kEMyGel tIk3AhCeUm0BwN86Sk7J3fSOf/a5nlo0wH+7B5Kn9TcQP5FlAz7OBEdwmXjsb6s4hQUq SOTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774971184; x=1775575984; 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=AFyRFKei9suLL4OspDT72haNVF/dIBE9vkd1iIbltuA=; b=V1GFKhW0AW2oGC7fZ73Q6M0l8XdZmh9KrW2JTfrGqDXLEVtVmOqsw2x6IXp4uFsXvy ZBkj6OWpAPT5CIWPlLsTgoKbl7AR6U68lt8Lz+vXHBSMzGsHHfrlnBprwB+DPBI/ixNo HH1CRQ1WLPFOqjYYK+Yj/b3bu6VGnmNxnWVrrs1ZU0emEu/2+9nIevedkDqd0CIE7nGO mtVZhJwC8BTPd8KUhpNPTVGDEkaDnnaz8ZKR7ZcTFLl6+EMmBYy8IJ8FOw5sLDiHWE8R RO8MpcNamw8g1LjhxsNBLgLyLsBhYR3hXC6p6wChRL8S7vrxRJiTd/g5xnGwMpyttHn2 gFkQ== X-Forwarded-Encrypted: i=1; AJvYcCUYVY5EbspmdSp5H80TwCABKbYXLlIRSILCBWez+prbhBONkjeB4d5rtdtZ4NMRux9KsqxWewl83CRbU6c=@vger.kernel.org X-Gm-Message-State: AOJu0YzTMdR14FniZb0vqVRgW1z213whS0nSFOht5bYbp/znj0nDnisF mE7iY7aHVoVNJn+JbMV38rpE/E16a3GQkXi+LuBffH9w4yrV3fDv8OWr X-Gm-Gg: ATEYQzw9jKRdhZnB6ytai4QP/sCjBVsIPKTp6VG71ctWOIM6kXdHFWeOHrESDxrgxls N3ZM9n2hr+Jc7m95cea5skYeBrU7rUIhMzyiu1sLfoYncm7oO3uMAMwawwpmnsPO2jE10PaBLuO QNQQjFz4r3qPGbcoH55cD80HBvsSuJQke8X4Akuv5F1BrUTkp6zx9rxJiEh8Yoat81DDg6qTCFX df+WtfBwb4sabr9eNXIm5ntDkWLRFQQxiwreRDfdAkoiaDrLLTw7sQCW7cgmnfi0XKJV62bILqS 3ywIZwxKQcMLhMFsafxDPwQtGlzd9mfIrCIcdYJSec/FkJU03HEHI9jqB5Mec1nCSG2h0UZw8tD ukeTBPJ2Ep7IIxsK4XY/+ifIVyIRezZHricAJuEAL4UytzPQhGLivM4xmcx7B0Df3KEkrAUYjVG 3W6/x3U78NEZVyOn2M6acYgw== X-Received: by 2002:a05:600c:83c3:b0:485:3428:774c with SMTP id 5b1f17b1804b1-48878281a4cmr70175035e9.4.1774971184157; Tue, 31 Mar 2026 08:33:04 -0700 (PDT) Received: from potato ([31.176.162.65]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887aceb230sm21653485e9.4.2026.03.31.08.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 08:33:03 -0700 (PDT) From: Omer El Idrissi To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Omer El Idrissi Subject: [PATCH 1/5] staging: rtl8723bs: use direct returns in rtw_sdio_if1_init Date: Tue, 31 Mar 2026 17:32:50 +0200 Message-ID: <20260331153255.22764-2-omer.e.idrissi@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331153255.22764-1-omer.e.idrissi@gmail.com> References: <20260331153255.22764-1-omer.e.idrissi@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" Clean up rtw_sdio_if1_init to use direct returns for the sake of readability. Signed-off-by: Omer El Idrissi --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 29 ++++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index d664e254912c..64618632ee78 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -224,14 +224,13 @@ static void sd_intf_stop(struct adapter *padapter) =20 static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const s= truct sdio_device_id *pdid) { - int status =3D _FAIL; struct net_device *pnetdev; struct adapter *padapter =3D NULL; struct sdio_data *psdio =3D &dvobj->intf_data; =20 padapter =3D vzalloc(sizeof(*padapter)); if (!padapter) - goto exit; + return NULL; =20 padapter->dvobj =3D dvobj; dvobj->if1 =3D padapter; @@ -289,27 +288,21 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj= _priv *dvobj, const struct =20 rtw_hal_disable_interrupt(padapter); =20 - status =3D _SUCCESS; + return padapter; =20 free_hal_data: - if (status !=3D _SUCCESS && padapter->HalData) - kfree(padapter->HalData); + kfree(padapter->HalData); =20 - if (status !=3D _SUCCESS) { - rtw_wdev_unregister(padapter->rtw_wdev); - rtw_wdev_free(padapter->rtw_wdev); - } + rtw_wdev_unregister(padapter->rtw_wdev); + rtw_wdev_free(padapter->rtw_wdev); =20 free_adapter: - if (status !=3D _SUCCESS) { - if (pnetdev) - rtw_free_netdev(pnetdev); - else - vfree((u8 *)padapter); - padapter =3D NULL; - } -exit: - return padapter; + if (pnetdev) + rtw_free_netdev(pnetdev); + else + vfree((u8 *)padapter); + + return NULL; } =20 static void rtw_sdio_if1_deinit(struct adapter *if1) --=20 2.51.0 From nobody Wed Apr 1 09:45:46 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 4C18041C2E3 for ; Tue, 31 Mar 2026 15:33:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971198; cv=none; b=s/MqVI83jZsI1R+5TVuJBlGPfcqqsd44KClBrhmuDynkivB+Yp7CzDs0oJnBj/MkDQvuemxokE+wP4QSsGGtXF2HtdfuWemrRGj9Pmk2Kzz8i4G+U1mHnlNUgfewTEYv/gfDGZxmfS1V50UbeCal38yTuiEGWRqMLcAphwuyTwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971198; c=relaxed/simple; bh=N/gwP6Kw713DVJ6gb4TQ7Ho9wHTLdAD1wlFdzd4dOP0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mJWh6xVpIoQPLbkfCGKEv6G4SNRCAKaFmq/D7VwUxs6Dxdsnzmrn1Zt5IYtThggDC6GYcFqnNEPOBXsXeSYty3d2khCfIfU0S3cpurSenK+WSQCbi4QysZX5nDJsuPIdpyWr4wKyJ8DxeGwuaTgrhQru6c9HI+cZMPjYnQ61gto= 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=Y2/ss5sC; arc=none smtp.client-ip=209.85.128.47 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="Y2/ss5sC" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso52618415e9.1 for ; Tue, 31 Mar 2026 08:33:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774971186; x=1775575986; 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=EZtupQHxoyxU+TuHxlXKDWJhqWX/uW8r+feDBWQESKE=; b=Y2/ss5sCUhxoqOGrQxHQJ0GCiQoV0jqsL4mvpVwHe0CqTrnvO+J/S08jTzgQGzLfg5 TIaosc3QUxqATiS38ELFF8hDghMQPrw7KIs+NGzpwRQaXn6oaQn6gIdnceDFJ6GTSJjl PI1SqvbQTjAFDoRQy9mslDFtxUxIKGpvuTKHQhnA6AMorSMPtJTdjYRtoFh7/dWXa+B+ zr/Zh/n2XGI4TSK+BiT9XoTlOiS29tQupwhjpHI7zpjdA+ekVJZwq/KrEI+9smPSx8ct V+TgK1e4mndW1VW7pimSEwb9WcS9NXVQYyAtgb1c385qKtHKeOtfm1g/VsXxtuXP9ux7 Xfzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774971186; x=1775575986; 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=EZtupQHxoyxU+TuHxlXKDWJhqWX/uW8r+feDBWQESKE=; b=e2+EPNkOawx0BoYwjmkK24N3wdFH9vBtpKWYnsb6F5f1RsKH+B3zwOHj42Hl2KoY7k SWRa2cPCvLGqL4qMcq6tTUCkCU0v3XwaFKltnd4x0Awh8j4WFKw9B8SDLyyB2QQ4jMTA gEzs+0rtuAbpaqa9X7WbGL/UWOvCOli9FJtbIUD2akYcOh1lPuC6lGSW4/k3+bSMiP7Z Q4Slt1yLX+uinPYk2qcf/vNIh/pnIBHD4+bSce5+aZ7PoF4xuMFY7Gjmz9jiLS66GNuM QsgYitgSDxQBE7bqWiTsewZvCPD8M88+h8N3Bcr/A90EIA3i0Rqja7l8UGT/gu2ZHuSr ArLg== X-Forwarded-Encrypted: i=1; AJvYcCVuE99VFsMvDVnVrwMAYRIvswsfGMigfT8wgyGW1E/dkCpe8yhjjVgZrsIWHJBtFGIKFX9FyaSiYinicUs=@vger.kernel.org X-Gm-Message-State: AOJu0YxNtdhWqjqoMH/O8pEEqxdzTpqbTzX5EXeAECsFklhYj9K7jg/A KBcd1NhSRpOyKIGG2IsyaeV8pCeoNTVl6Q/nT+X3l20WEGyVQM3bb45G X-Gm-Gg: ATEYQzzDYgfIQTHshI8+tHfTKC8+AWqe4BXW/PV49R5d+n0UGXSVskg326HS8zWa4hw sP+uN4mjGpxzxEUG0BStKODcfyjlXE2m2V6Pm3YI8A75WHyofv/tro0bgBDdISfnYpaON6yELNW 0cZpJpwEyCJFdulcpHkIAHEsKp+lJZjZVBqvKyacmw6RxNlSOO7hoTHXInNlCeBd85SnFg4hxah QMfgmVyO4QM3ck7quxQankT2gB2RNv2yfbAfIZRCEWOGKReerIgNeKXbFiukXOt89iFXxn9WVq4 kfcOMrTD1NmtA4cXHzjziK7xS46V8WwrHBKzLw4DFg5ubM4WBL5U3kPdxkd3OPgluDo9xsjQN+b XWOK+XG+Ke7WZTAylbr1hWjLNhXh7SWF1e7x0qugmXdhLdCN9JV6YFsd6zp2s+crb+ufBDEjbX9 Y8zTtf9XYEkScmsxjSvV4C0Q== X-Received: by 2002:a05:600c:8b03:b0:485:3c66:e230 with SMTP id 5b1f17b1804b1-48727ef1756mr323087115e9.29.1774971185383; Tue, 31 Mar 2026 08:33:05 -0700 (PDT) Received: from potato ([31.176.162.65]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887aceb230sm21653485e9.4.2026.03.31.08.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 08:33:04 -0700 (PDT) From: Omer El Idrissi To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Omer El Idrissi Subject: [PATCH 2/5] staging: rtl8723bs: remove useless line in rtw_sdio_if1_init Date: Tue, 31 Mar 2026 17:32:51 +0200 Message-ID: <20260331153255.22764-3-omer.e.idrissi@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331153255.22764-1-omer.e.idrissi@gmail.com> References: <20260331153255.22764-1-omer.e.idrissi@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" Remove line in rtw_sdio_if1_init that just sets padapter to itself. padapter is allocated at the top of the function, put inside the pnetdev priv (rtw_init_netdev), and retrieved with rtw_netdev_priv, which doesn't change anything. Signed-off-by: Omer El Idrissi --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index 64618632ee78..8412331c4949 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -247,8 +247,6 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_p= riv *dvobj, const struct =20 SET_NETDEV_DEV(pnetdev, dvobj_to_dev(dvobj)); =20 - padapter =3D rtw_netdev_priv(pnetdev); - /* 3 3. init driver special setting, interface, OS and hardware relative = */ =20 /* 4 3.1 set hardware operation functions */ --=20 2.51.0 From nobody Wed Apr 1 09:45:46 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 099D64218A1 for ; Tue, 31 Mar 2026 15:33:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971198; cv=none; b=hDxSHCuXG42HKSi/oow3zz9Bo2EcAsrNb57/RimILC/CqTox1q2by0aGok0LzZxLh22i8ODTRUi+UexQn2kqP3IrMjkVf+NGR+/rO4LEapX7BrYlbzrrdcwu1uWsJE4qmphTO6AUeE2W+9AOTJJSpDWS0xIcKJs8RuT82EIh6JQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971198; c=relaxed/simple; bh=XuMF4Iwo/Q3Cw4g048XgTqWROq+eXMG7KqmpAsuphUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dCRL3OAN5OVunpS6EA2av37+X05Hkac13SLSkHuPplZ05mvbvSKlAc6j57bVZ2ZRAEVLG7lG90l/WjUbk41Bi4cseBRiYpn2pYghj7YD6GZOuyXx/Kop6lfuHN+x+PqaFxFzf0lyuewy6yb763NcOCcpTZNfs+st/8dm438YzFQ= 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=h8/GWF/v; arc=none smtp.client-ip=209.85.128.42 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="h8/GWF/v" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-486fc4725f0so59840755e9.1 for ; Tue, 31 Mar 2026 08:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774971187; x=1775575987; 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=+I9eAVxuzIECUekDIQB/9U5LTPHbgaUxYWgvVH1dKd0=; b=h8/GWF/vMKK04xF9q72e44QBrrPfB+iq56LYeWnLpANXmISb49IPB9wruCLXQOqRjB 2VF1NXoVviCvt9awzrI9tc+uoi1a0SbdQ430aMzdTdqN9I9bNfpQi45uZ2oN/gAWIGhB hYOHdjFZmTNgj2uNZHyH6zo1QwPbD50OyVxnuR1ldsDc6Pw/TdQwqpSO1sYf3iHQRWc9 QTrnfsFCfOKN+qOfRoxgexPvlvTE1OFCJtxDlsf51aCHz6FJCJ93K1oPQLliIVrzRnNB llqM3XH+LUEvxJh+nFzi3z6AYIrCa55BMP4AtzIdzjg5Xun9N8Ei4Dc/jDSJefu3uj6Q QSDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774971187; x=1775575987; 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=+I9eAVxuzIECUekDIQB/9U5LTPHbgaUxYWgvVH1dKd0=; b=lQ1m9C5uTjN2eL+nye6VWcNQdXsncMNPiH8UQ6qMSv8ekit91db+2qafKoi9Km55IB aulvxYBtIWPvmwSE3dDTDO4zkGj59GUOi3v6H98LOWTVGQZ0TNgRYYzvUmkFfdv4RyhT m11/VUx/s/xvCa2uNGt7gY4NME8L9QlAva2vP7+w3ZkxdHVgPWjVn1Xn6VY/HjEz+9gZ YH2rHWRKOXTntt4Sy5s5oEf00evhrfhMNK1AblrZwyWWjOIt63W0oVRm0kq6clfkXwsY ymsq2lLpfrBTI08XlYdeexXdzWUKoeIB/ZCRnLSiwHDwtQg4HEcB9NbD5+R+bwB71Rw4 n0kA== X-Forwarded-Encrypted: i=1; AJvYcCU30Ky6lihEVXFgvwiCcNPkLn67VU6Tiix6vkxHUFfFWrYOZSKeTzU9PZYA4CM0ITxDBwj/o19BYye0288=@vger.kernel.org X-Gm-Message-State: AOJu0YxrGjp7scaXzO56edW3X2iL2xyxNsc00rZAboV5GzqImmkflhgF FPsOehgQ5sgXBbB/aoRjWp4b1779fx4BEmynRugn9q6euiRKcNdD6DWy X-Gm-Gg: ATEYQzwAHWM4/Uq77QVsDft/yvzDHrcvvFv02dOqimcCp0IOs7itLlqHWOTE2abBEfE 8YNGZjbYj8+KQqvXnnYE2nS3HO7/+0YFB4Q/fnK5Pd1sMvWepRubndI+UYvGnuS7i0ss0zoOmLY x6RuCiZhtm1mI7y1uge8n6NdWF9QiTg1ViH/dHXo1BSInphqwaoWD0eOPw8Tz4Pnt4v4lH7Ku9H qzdA6N12itQZbyg6NoPD2sXdjltv9GDrE2vktTAQqaF9w1DjtLbfYGY8Grc2bLU4J8xa5PwIHMd AK52OR8bI+RZ08v9juMMe0y8H2G/JGvcjxhnpzcjOOwI2bMV6PB8Vdx9+6RHYecuxfXhNoDrLEk R3OF+aEXVq6uHn2mXSc+Cp1cmbnOCGfRWjnYrCYuJvMtzOkICW6ccXBq2H0mGYvJeRIwX0Cpd/1 ieXEVYhtILfIivFsCm1khGvQ== X-Received: by 2002:a05:600c:468b:b0:485:3989:b3e4 with SMTP id 5b1f17b1804b1-4887828a552mr67817915e9.6.1774971186766; Tue, 31 Mar 2026 08:33:06 -0700 (PDT) Received: from potato ([31.176.162.65]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887aceb230sm21653485e9.4.2026.03.31.08.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 08:33:06 -0700 (PDT) From: Omer El Idrissi To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Omer El Idrissi Subject: [PATCH 3/5] staging: rtl8723bs: remove use of vendor-defined status macros Date: Tue, 31 Mar 2026 17:32:52 +0200 Message-ID: <20260331153255.22764-4-omer.e.idrissi@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331153255.22764-1-omer.e.idrissi@gmail.com> References: <20260331153255.22764-1-omer.e.idrissi@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" Remove the check for _FAIL macro on two occurrences in rtw_sdio_if1_init Signed-off-by: Omer El Idrissi --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index 8412331c4949..34ef40a86153 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -262,7 +262,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_p= riv *dvobj, const struct padapter->intf_alloc_irq =3D &sdio_alloc_irq; padapter->intf_free_irq =3D &sdio_free_irq; =20 - if (rtw_init_io_priv(padapter, sdio_set_intf_ops) =3D=3D _FAIL) + if (rtw_init_io_priv(padapter, sdio_set_intf_ops)) goto free_hal_data; =20 rtw_hal_read_chip_version(padapter); @@ -275,7 +275,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_p= riv *dvobj, const struct rtw_hal_read_chip_info(padapter); =20 /* 3 7. init driver common data */ - if (rtw_init_drv_sw(padapter) =3D=3D _FAIL) + if (rtw_init_drv_sw(padapter)) goto free_hal_data; =20 rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)); --=20 2.51.0 From nobody Wed Apr 1 09:45:46 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 37FEA410D2F for ; Tue, 31 Mar 2026 15:33:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971202; cv=none; b=XQMmxPT+x8rNdFD5W43fPZHjIdF4HA1IfvQcuvn1GmbjJj8V5f6bpRrQa9zaHx0HzJY7NcNtVjrtjIowC5Q7qnBiRWyFoAbhMQ7pWWi0zgTkfvxlb5+adc/C2cegvThNdQwnDQ73RvEYeD7cMd8JsNK6FT3wXZAKYi2ZTv1NsRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971202; c=relaxed/simple; bh=qp2cnGIOvfGUlyVb7lBhxDQjhsF0kpQ/NLBt7h4yYU0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tqlLWSdFMPuKWsrTR4IcsH/LT2A7jlfICNzLZyM1dpOYiJgLhL3Vqed/KxRmsY/TViV82KSkbLq+Gq5w4WbpI3i9WANrT2s4I/vsCpeY+pPnpacy68+V0dmmvFPctalHsDkC//xjtBh4KGJr49Q0sysASxX6uvz4ev039b6q6qo= 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=sW9etXYw; arc=none smtp.client-ip=209.85.128.47 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="sW9etXYw" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-483487335c2so62942945e9.2 for ; Tue, 31 Mar 2026 08:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774971188; x=1775575988; 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=wp8quepZFqze/sjFZFLCxsK6j2aXBhvO/wnQp/VrWjE=; b=sW9etXYwt+0MQgvKYN8tJIf/nVMXmVfBuMg1yc0T0PqHrhirv0poHa6iXi3aqGlRva /BvUm57kWh93AaRTAh9b14t/j7AIURZwueil0L2A/wjErDWkvNSbYcJXvY3beYTZ2CfZ +u/aDjPITRM4nPmd1dpYsxmBHQgOZO0cUvdzy+5Ub+swmQS6pgW8FPMmJ1K+8kJRz88A t0txIZcHVHJV3Ue1fbCdN8senPGJhn1GNiKI+WocJN+2/HuvWO1R6E4Xm/2ju/V2OPUx K0bNVHFGiRSQD/rQ6CxEd5v6czb9V0GP3GT2YBAJ9eXukgyW4dG45f4zGzQISqAaI77o h53Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774971188; x=1775575988; 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=wp8quepZFqze/sjFZFLCxsK6j2aXBhvO/wnQp/VrWjE=; b=BZmttvLogZLty3ej9ZfXbipR9XQhR1tEDKp8QCALJjDLrx30GVN8ABnOhGU4/UGRq4 YWFXBQz8qMv9SUt86Q0njB2ODbDHa274ZC3T19AqM6sz7j3i9jwZ7vRk1+0S9GUxk0P0 PtAbd34LvQaOknbCUMIL+mp0m5o1Grk0SbDUvnlqaLB/oaSpKiSxDau5/Yuy02d8x3UD 9arC3U35gajWskHjm9dQB9usNu+kJoktSGqkJ+xbHU3pwqYZu2shsmB/5fnuiR9BD14C HVrcaCs/ClGv51hKZrHgIhr6Ng4KPd+R/GbZ6SrxIX9lfd/LRLoo1ImGSMeZ0CIJ5BDR aX5g== X-Forwarded-Encrypted: i=1; AJvYcCVBwK73mU3laA1ayfhEoBnCgiuZzoz/q1+8+v+UEnMSIqgvH2RFv/Rfqt0AQEbBjuQ/RW3kNBO6rrpmrN0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2Z8J718xZuAemdFVP/4J0yle5W9kjxEZslAYtumif4MjYCuzQ 4rz6sDsNCjWWREiryFviIJasyQsONBr6/lxW9tF9EGkbmAi02M/tmSi6 X-Gm-Gg: ATEYQzwsxuQcLYx3hxukFm6UKigLRbgQ1ZMiyLG652PJ6EIFwV93J6v2XHLuyvdQvKg 6oDm2GelamNBPASUTeisgC8KvqFHgGViKJxuHRSdl0aEPexxCyiWhYklpwbXs9udYEXWUWu8qJU Mo5qdzIX/v1umFAztgCSrh7JFY22E1fQio/IP2DPC6LslgZ0VFsZMC/4Skz3AIowCDlNkeXPoBe 8WjOmft8/oKhW5XgLmuPh2URAD6Xn0pwPlvX5r5EnNVLGdeG6SgvRmE3boopAJyrBY6xZH23eW2 tb0Hz1QUSNuTGCgdEux1EO53ZgpCOebqMyi/6BneqNssVIXQfiXiwNFTODx67B2GMYsA5QFJ/L7 HFYmDaSQZeYRD4MHN8taNztZNHjEWFxCi/VzkhoN/LcFsZvdHim85qV2UvMIzvasthXCQ7zKehm 3uC27/iFaGAmld3MUNqOcObzSihW90ZLCX X-Received: by 2002:a05:600c:4e0e:b0:485:2a85:e5ec with SMTP id 5b1f17b1804b1-48727ef5508mr286870345e9.2.1774971187771; Tue, 31 Mar 2026 08:33:07 -0700 (PDT) Received: from potato ([31.176.162.65]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887aceb230sm21653485e9.4.2026.03.31.08.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 08:33:07 -0700 (PDT) From: Omer El Idrissi To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Omer El Idrissi Subject: [PATCH 4/5] staging: rtl8723bs: replace function with error handling alternative Date: Tue, 31 Mar 2026 17:32:53 +0200 Message-ID: <20260331153255.22764-5-omer.e.idrissi@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331153255.22764-1-omer.e.idrissi@gmail.com> References: <20260331153255.22764-1-omer.e.idrissi@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 the use of rtw_set_hal_ops with rtw_hal_data_init in rtw_sdio_if1_init , which actually returns error or success and not void. rtw_set_hal_ops literally only calls rtw_hal_data_init and just ignores the possibility of errors. This is the only place this function is used, so remove it's unnecessary definitions in include/sdio_hal.h as a prototype and os_dep/sdio_intf.c as a function. Signed-off-by: Omer El Idrissi --- drivers/staging/rtl8723bs/include/sdio_hal.h | 1 - drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/include/sdio_hal.h b/drivers/staging= /rtl8723bs/include/sdio_hal.h index 6538253765f1..4ad145d5d33f 100644 --- a/drivers/staging/rtl8723bs/include/sdio_hal.h +++ b/drivers/staging/rtl8723bs/include/sdio_hal.h @@ -9,6 +9,5 @@ =20 u8 sd_int_isr(struct adapter *padapter); void sd_int_dpc(struct adapter *padapter); -void rtw_set_hal_ops(struct adapter *padapter); =20 #endif /* __SDIO_HAL_H__ */ diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index 34ef40a86153..aea9b4e19874 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -197,12 +197,6 @@ static void sdio_dvobj_deinit(struct sdio_func *func) } } =20 -void rtw_set_hal_ops(struct adapter *padapter) -{ - /* alloc memory for HAL DATA */ - rtw_hal_data_init(padapter); -} - static void sd_intf_start(struct adapter *padapter) { if (!padapter) @@ -250,8 +244,9 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_p= riv *dvobj, const struct /* 3 3. init driver special setting, interface, OS and hardware relative = */ =20 /* 4 3.1 set hardware operation functions */ - rtw_set_hal_ops(padapter); - + /* allocates padapter->HalData */ + if (rtw_hal_data_init(padapter)) + goto free_adapter; =20 /* 3 5. initialize Chip version */ padapter->intf_start =3D &sd_intf_start; --=20 2.51.0 From nobody Wed Apr 1 09:45:46 2026 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 684D0413223 for ; Tue, 31 Mar 2026 15:33:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971202; cv=none; b=jXDJpz83FBpel/p7DZ75xtTB/D4SuhsgGJXWy/d6UiGd3HIyBcJSS13CSrWLh4Reo05gXYK6g6QHWs93+Pah+YXaQQExsEZoPw8hfTNx8WLj/9iX1/5NX+BNAoNuc7fLsJ+gOuTm6fv3FQhe6VXeW++wGcuS53CjeMtO4iXLvp8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971202; c=relaxed/simple; bh=+QLp+W+N/h7ONWCYZjLE/LwSDtdFmevLfErmTRH22Rc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KfoEke5LMMUldcMFubYJWoQqAzFmsefd0oaoWDFYVCx+MjdO4oPeEAyDXtoX+/aJp5Ra9w+fncM91BwKAp3Fyq8/5/nGwM/y0NU9I8OtuRP9XTDC3nJUQjR8K8NIMD9GXycpep6us2tQ4+SCOj3iDfxXkbU1EE6txdgJeklgwko= 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=QlEX9Juw; arc=none smtp.client-ip=209.85.128.53 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="QlEX9Juw" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4888244e9f9so1802455e9.0 for ; Tue, 31 Mar 2026 08:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774971189; x=1775575989; 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=ZJutMm6/Y5MNx7yEDzl3x8JS0IdVhmYLXjsl5fR/2SQ=; b=QlEX9Juw/MdjHrcdXnqDxi+3usK3DzoOLqhFlw+PUmEcKJzRh/RGlwHryOLdirjjiz MBvlzxNeRr3EybCd8ti2CD8dL9rKWlBLRLQQGzrUcDBeWoh8J/t13/zrD0AIy/FOkvBV M4nMnTaEmqzJUuZI6iuTa34Pu2+T7mUnfxosjQZh04x3L4pBC7HqWpoyMsiejl6fwyKK QlsP0ExktJG13xdh19Ty5TF4wRVp5/PYzaWm5WUTyG23P6o6egs/8qlfRwA+55dfIIB7 +FJfWHK25sEYpJPRxJ56ifaM1feCH0YgOqmuQx2HBCtoR3ln4p5J1rO0AGdor7S7YBMU FQSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774971189; x=1775575989; 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=ZJutMm6/Y5MNx7yEDzl3x8JS0IdVhmYLXjsl5fR/2SQ=; b=Rr1FHYlGCoYBIfbX5Bbs/Cv+q6Ht+zvbfGv5JTL6cO2uL7tr2TT+DHslWK1nx0jk1+ YulMcIZWrrPQDmhBbIi6vUla3xZJXYPCpj8W6TdD1501l+i/zVlqw9XmxS4BZIBYnP50 oZFy7M9f36mL2U0BryjHq7tPiXU76oewnZ8ER0+olQk3o0uM3V9e3OLKaB0Tfaw/6Pno CdnFHGE59iwPTaIHFwS1X77ioLEszLWVYv3OGfXp1hpow2jEVRIIuCF/2Zs83vgDBy1s 6+Yd8GkxXZzLzUC3DTzfgYValIQa9Ryx51y3wluANFlOVt0jXgFBjBjWDiU5o5W/btSe wmoQ== X-Forwarded-Encrypted: i=1; AJvYcCWeP+2GJj5MEt5M6L7j+ksqMfM60sbr9DfRZJjM5IYVc75rh1himOUd4zNURsgg9LfJHjXQh4Ol2RTcrmc=@vger.kernel.org X-Gm-Message-State: AOJu0Yz43m2Tir3IJBxs7e+jQLEWSiq1nBNVRh+cwOp71N8pU5SAC2ry oGS6rCPo8EUzmu9Y3Bo1LLXI7iyh7dTHWOql2Ka+OvaGwP76FQXkan5GXJIiypC3 X-Gm-Gg: ATEYQzyzlzW5C50F1xzX2zmtww/TLpI37oKj/tbcgAsRiZK7lfRQJjy0FhtzylWHweq RuzjNRQrHLgTkxLoxRC0jEh+6M5Bcr4eIPFOtCdwMOW/V+Lgctg6B34meLSBnPYybirMth/8c+e 8YF7mdWgdbGtR6sb2Ke+9Wt9eNdet32+uqjtPGiFXVNcK1twJIncSdIygajGG1Mr7+MNq26r6BD J9sw3O0+h40iczkvSa6OWfTgPHUKeidw4V5QG4hCUS9I2WKA+LxgbxDMOJjgZDRP1AL2/1Fc1NG OSQD2Bgi1t+Wj8zmAnC4NAdiXGnzIfN8CQEEL6OVQiQ1vg5Tqx69BV1IO7ZrwllLCixKK/oeosD tVn/tfpux2OPcZMbE1mee8F39gg+pY9q8nBKLXCuCoqL6/GtyLceUs3GESEXaty9HCDFGFUtG+s S+boGJTQRmnBvzheUJ/t9w5Q== X-Received: by 2002:a05:600c:4f91:b0:486:fb69:4960 with SMTP id 5b1f17b1804b1-48727edde49mr272182805e9.19.1774971188933; Tue, 31 Mar 2026 08:33:08 -0700 (PDT) Received: from potato ([31.176.162.65]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887aceb230sm21653485e9.4.2026.03.31.08.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 08:33:08 -0700 (PDT) From: Omer El Idrissi To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Omer El Idrissi Subject: [PATCH 5/5] staging: rtl8723bs: add separate label for freeing rtw_wdev Date: Tue, 31 Mar 2026 17:32:54 +0200 Message-ID: <20260331153255.22764-6-omer.e.idrissi@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331153255.22764-1-omer.e.idrissi@gmail.com> References: <20260331153255.22764-1-omer.e.idrissi@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 original function would "unregister" and "free" padapter->rtw_wdev IF it ran into issues after "hardware operation functions" were set. The problem is that rtw_wdev isn't even allocated at that point. So separate the rtw_wdev_unregister and rtw_wdev_free code into it's own label, add error check to rtw_wdev_alloc and move it up a bit. When rtw_init_drv_sw fails goto free_wdev instead of free_hal_data. Signed-off-by: Omer El Idrissi --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index aea9b4e19874..a088dae40a19 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -268,12 +268,13 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj= _priv *dvobj, const struct =20 /* 3 6. read efuse/eeprom data */ rtw_hal_read_chip_info(padapter); +=09 + if (rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)))=20 + goto free_hal_data; =20 /* 3 7. init driver common data */ if (rtw_init_drv_sw(padapter)) - goto free_hal_data; - - rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)); + goto free_wdev; =20 /* 3 8. get WLan MAC address */ /* set mac addr */ @@ -283,12 +284,13 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj= _priv *dvobj, const struct =20 return padapter; =20 -free_hal_data: - kfree(padapter->HalData); - +free_wdev: rtw_wdev_unregister(padapter->rtw_wdev); rtw_wdev_free(padapter->rtw_wdev); =20 +free_hal_data: + kfree(padapter->HalData); + free_adapter: if (pnetdev) rtw_free_netdev(pnetdev); --=20 2.51.0