From nobody Mon Sep 15 14:13:50 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41C3CC46467 for ; Wed, 11 Jan 2023 19:57:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232608AbjAKT5M (ORCPT ); Wed, 11 Jan 2023 14:57:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229935AbjAKT5B (ORCPT ); Wed, 11 Jan 2023 14:57:01 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E08C1789D for ; Wed, 11 Jan 2023 11:56:57 -0800 (PST) Received: from dslb-188-096-145-172.188.096.pools.vodafone-ip.de ([188.96.145.172] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1pFhDQ-0005F2-Hi; Wed, 11 Jan 2023 20:56:52 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 01/20] staging: r8188eu: remove struct io_priv Date: Wed, 11 Jan 2023 20:56:21 +0100 Message-Id: <20230111195640.306748-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230111195640.306748-1-martin@kaiser.cx> References: <20230111195640.306748-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" struct io_priv has only one member (and a pointer to the enclosing struct adapter). We can remove struct io_priv and move its member directly into struct adapter. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 21 +++++++-------------- drivers/staging/r8188eu/include/drv_types.h | 2 +- drivers/staging/r8188eu/include/rtw_io.h | 5 ----- drivers/staging/r8188eu/os_dep/usb_intf.c | 5 +---- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/= r8188eu/hal/usb_ops_linux.c index a238d29a3a46..0deaa5c24ab2 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -95,8 +95,7 @@ static int usb_write(struct intf_hdl *intf, u16 value, vo= id *data, u8 size) =20 int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data) { - struct io_priv *io_priv =3D &adapter->iopriv; - struct intf_hdl *intf =3D &io_priv->intf; + struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; =20 return usb_read(intf, value, data, 1); @@ -104,8 +103,7 @@ int __must_check rtw_read8(struct adapter *adapter, u32= addr, u8 *data) =20 int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data) { - struct io_priv *io_priv =3D &adapter->iopriv; - struct intf_hdl *intf =3D &io_priv->intf; + struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; __le16 le_data; int res; @@ -121,8 +119,7 @@ int __must_check rtw_read16(struct adapter *adapter, u3= 2 addr, u16 *data) =20 int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data) { - struct io_priv *io_priv =3D &adapter->iopriv; - struct intf_hdl *intf =3D &io_priv->intf; + struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; __le32 le_data; int res; @@ -138,8 +135,7 @@ int __must_check rtw_read32(struct adapter *adapter, u3= 2 addr, u32 *data) =20 int rtw_write8(struct adapter *adapter, u32 addr, u8 val) { - struct io_priv *io_priv =3D &adapter->iopriv; - struct intf_hdl *intf =3D &io_priv->intf; + struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; int ret; =20 @@ -150,8 +146,7 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 va= l) =20 int rtw_write16(struct adapter *adapter, u32 addr, u16 val) { - struct io_priv *io_priv =3D &adapter->iopriv; - struct intf_hdl *intf =3D &io_priv->intf; + struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; __le16 data =3D cpu_to_le16(val); int ret; @@ -163,8 +158,7 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 = val) =20 int rtw_write32(struct adapter *adapter, u32 addr, u32 val) { - struct io_priv *io_priv =3D &adapter->iopriv; - struct intf_hdl *intf =3D &io_priv->intf; + struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; __le32 data =3D cpu_to_le32(val); int ret; @@ -176,8 +170,7 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 = val) =20 int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *data) { - struct io_priv *io_priv =3D &adapter->iopriv; - struct intf_hdl *intf =3D &io_priv->intf; + struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; int ret; =20 diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index 4803d0c77d70..614673902377 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -152,7 +152,7 @@ struct adapter { struct mlme_ext_priv mlmeextpriv; struct cmd_priv cmdpriv; struct evt_priv evtpriv; - struct io_priv iopriv; + struct intf_hdl intf; struct xmit_priv xmitpriv; struct recv_priv recvpriv; struct sta_priv stapriv; diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r81= 88eu/include/rtw_io.h index e9744694204b..c15b2e873fd5 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -203,11 +203,6 @@ struct io_queue { struct intf_hdl intf; }; =20 -struct io_priv { - struct adapter *padapter; - struct intf_hdl intf; -}; - uint ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue); void sync_ioreq_enqueue(struct io_req *preq, struct io_queue *ioqueue); uint sync_ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue); diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index 5fbfbcd95de2..1f70e5fee1b2 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -290,7 +290,6 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, s= truct usb_interface *pusb { struct adapter *padapter =3D NULL; struct net_device *pnetdev =3D NULL; - struct io_priv *piopriv; struct intf_hdl *pintf; int ret; =20 @@ -319,9 +318,7 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, s= truct usb_interface *pusb padapter->intf_stop =3D &usb_intf_stop; =20 /* step init_io_priv */ - piopriv =3D &padapter->iopriv; - pintf =3D &piopriv->intf; - piopriv->padapter =3D padapter; + pintf =3D &padapter->intf; pintf->padapter =3D padapter; pintf->pintf_dev =3D adapter_to_dvobj(padapter); =20 --=20 2.30.2