From nobody Mon Sep 15 14:16:12 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 8FE83C46467 for ; Wed, 11 Jan 2023 20:00:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239789AbjAKT7R (ORCPT ); Wed, 11 Jan 2023 14:59:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235793AbjAKT5Q (ORCPT ); Wed, 11 Jan 2023 14:57:16 -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 08B4DB73 for ; Wed, 11 Jan 2023 11:57:15 -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 1pFhDe-0005F2-IF; Wed, 11 Jan 2023 20:57:06 +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 17/20] staging: r8188eu: pass struct adapter to usb_read Date: Wed, 11 Jan 2023 20:56:37 +0100 Message-Id: <20230111195640.306748-18-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" The usb_read function takes a struct intf_hdl only to extract the struct adapter from it. We can pass struct adapter directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/= r8188eu/hal/usb_ops_linux.c index 0deaa5c24ab2..f8900b51d750 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -7,9 +7,8 @@ #include "../include/usb_ops.h" #include "../include/rtl8188e_hal.h" =20 -static int usb_read(struct intf_hdl *intf, u16 value, void *data, u8 size) +static int usb_read(struct adapter *adapt, u16 value, void *data, u8 size) { - struct adapter *adapt =3D intf->padapter; struct dvobj_priv *dvobjpriv =3D adapter_to_dvobj(adapt); struct usb_device *udev =3D dvobjpriv->pusbdev; int status; @@ -95,20 +94,18 @@ static int usb_write(struct intf_hdl *intf, u16 value, = void *data, u8 size) =20 int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data) { - struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; =20 - return usb_read(intf, value, data, 1); + return usb_read(adapter, value, data, 1); } =20 int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data) { - struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; __le16 le_data; int res; =20 - res =3D usb_read(intf, value, &le_data, 2); + res =3D usb_read(adapter, value, &le_data, 2); if (res) return res; =20 @@ -119,12 +116,11 @@ int __must_check rtw_read16(struct adapter *adapter, = u32 addr, u16 *data) =20 int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data) { - struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; __le32 le_data; int res; =20 - res =3D usb_read(intf, value, &le_data, 4); + res =3D usb_read(adapter, value, &le_data, 4); if (res) return res; =20 --=20 2.30.2