From nobody Sun Sep 14 11:10:01 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 86E2DC25B50 for ; Mon, 23 Jan 2023 20:54:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231609AbjAWUyF (ORCPT ); Mon, 23 Jan 2023 15:54:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjAWUyC (ORCPT ); Mon, 23 Jan 2023 15:54:02 -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 D8CBD7DB5 for ; Mon, 23 Jan 2023 12:54:01 -0800 (PST) Received: from ipservice-092-217-089-134.092.217.pools.vodafone-ip.de ([92.217.89.134] 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 1pK3pE-0000Lk-TD; Mon, 23 Jan 2023 21:53:56 +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 02/23] staging: r8188eu: pass struct adapter to usb_write Date: Mon, 23 Jan 2023 21:53:21 +0100 Message-Id: <20230123205342.229589-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123205342.229589-1-martin@kaiser.cx> References: <20230123205342.229589-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_write 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 | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/= r8188eu/hal/usb_ops_linux.c index d82abfcd91f3..9f008e61a6f2 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -49,9 +49,8 @@ static int usb_read(struct adapter *adapt, u16 value, voi= d *data, u8 size) return status; } =20 -static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size) +static int usb_write(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; @@ -131,48 +130,44 @@ int __must_check rtw_read32(struct adapter *adapter, = u32 addr, u32 *data) =20 int rtw_write8(struct adapter *adapter, u32 addr, u8 val) { - struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; int ret; =20 - ret =3D usb_write(intf, value, &val, 1); + ret =3D usb_write(adapter, value, &val, 1); =20 return RTW_STATUS_CODE(ret); } =20 int rtw_write16(struct adapter *adapter, u32 addr, u16 val) { - struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; __le16 data =3D cpu_to_le16(val); int ret; =20 - ret =3D usb_write(intf, value, &data, 2); + ret =3D usb_write(adapter, value, &data, 2); =20 return RTW_STATUS_CODE(ret); } =20 int rtw_write32(struct adapter *adapter, u32 addr, u32 val) { - struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; __le32 data =3D cpu_to_le32(val); int ret; =20 - ret =3D usb_write(intf, value, &data, 4); + ret =3D usb_write(adapter, value, &data, 4); =20 return RTW_STATUS_CODE(ret); } =20 int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *data) { - struct intf_hdl *intf =3D &adapter->intf; u16 value =3D addr & 0xffff; =20 if (length > VENDOR_CMD_MAX_DATA_LEN) return -EINVAL; =20 - return usb_write(intf, value, data, length); + return usb_write(adapter, value, data, length); } =20 static void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf) --=20 2.30.2