From nobody Sun Jun 28 08:39:26 2026 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 4B873C433EF for ; Wed, 9 Feb 2022 19:29:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232531AbiBIT31 (ORCPT ); Wed, 9 Feb 2022 14:29:27 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:54074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233839AbiBIT2w (ORCPT ); Wed, 9 Feb 2022 14:28:52 -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 205ECC0DE7E2 for ; Wed, 9 Feb 2022 11:28:53 -0800 (PST) Received: from dslb-188-096-136-245.188.096.pools.vodafone-ip.de ([188.96.136.245] 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 1nHse0-00049w-1Z; Wed, 09 Feb 2022 20:28:48 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH] staging: r8188eu: remove ishighspeed from dvobj_priv Date: Wed, 9 Feb 2022 20:28:42 +0100 Message-Id: <20220209192842.99399-1-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 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" There's no need to store the usb device speed in struct dvobj_priv. We can read the speed from struct usb_device. dvobj_priv has a pointer to the usb_device. Reorder one if-statement to make the code clearer. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_iol.c | 4 +++- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 6 +++--- drivers/staging/r8188eu/include/drv_types.h | 1 - drivers/staging/r8188eu/include/usb_ops.h | 2 +- drivers/staging/r8188eu/os_dep/usb_intf.c | 8 -------- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_iol.c b/drivers/staging/r8188= eu/core/rtw_iol.c index 923da2a9f6ae..f5f03160759c 100644 --- a/drivers/staging/r8188eu/core/rtw_iol.c +++ b/drivers/staging/r8188eu/core/rtw_iol.c @@ -68,8 +68,10 @@ bool rtw_IOL_applied(struct adapter *adapter) if (1 =3D=3D adapter->registrypriv.fw_iol) return true; =20 - if ((2 =3D=3D adapter->registrypriv.fw_iol) && (!adapter_to_dvobj(adapter= )->ishighspeed)) + if ((2 =3D=3D adapter->registrypriv.fw_iol) && + (adapter_to_dvobj(adapter)->pusbdev->speed !=3D USB_SPEED_HIGH)) return true; + return false; } =20 diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging= /r8188eu/hal/rtl8188eu_xmit.c index 205a392a0ad3..f2555c97b0c4 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -403,7 +403,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt,= struct xmit_priv *pxmitp /* dump frame variable */ u32 ff_hwaddr; =20 - if (pdvobjpriv->ishighspeed) + if (pdvobjpriv->pusbdev->speed =3D=3D USB_SPEED_HIGH) bulksize =3D USB_HIGH_SPEED_BULK_SIZE; else bulksize =3D USB_FULL_SPEED_BULK_SIZE; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 659e0f26db29..1f2c736c3bc4 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -99,10 +99,10 @@ static void _InitInterrupt(struct adapter *Adapter) /* 1; Use bulk endpoint to upload interrupt pkt, */ usb_opt =3D rtw_read8(Adapter, REG_USB_SPECIAL_OPTION); =20 - if (!adapter_to_dvobj(Adapter)->ishighspeed) - usb_opt =3D usb_opt & (~INT_BULK_SEL); - else + if (adapter_to_dvobj(Adapter)->pusbdev->speed =3D=3D USB_SPEED_HIGH) usb_opt =3D usb_opt | (INT_BULK_SEL); + else + usb_opt =3D usb_opt & (~INT_BULK_SEL); =20 rtw_write8(Adapter, REG_USB_SPECIAL_OPTION, usb_opt); } diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index 618a6529192b..894e70a0d506 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -137,7 +137,6 @@ struct dvobj_priv { =20 /*-------- below is for USB INTERFACE --------*/ =20 - u8 ishighspeed; u8 RtNumOutPipes; =20 struct usb_interface *pusbintf; diff --git a/drivers/staging/r8188eu/include/usb_ops.h b/drivers/staging/r8= 188eu/include/usb_ops.h index 0a1155bbc7b8..62e4706c0497 100644 --- a/drivers/staging/r8188eu/include/usb_ops.h +++ b/drivers/staging/r8188eu/include/usb_ops.h @@ -55,7 +55,7 @@ static inline u8 rtw_usb_bulk_size_boundary(struct adapte= r *padapter, u8 rst =3D true; struct dvobj_priv *pdvobjpriv =3D adapter_to_dvobj(padapter); =20 - if (pdvobjpriv->ishighspeed) + if (pdvobjpriv->pusbdev->speed =3D=3D USB_SPEED_HIGH) rst =3D (0 =3D=3D (buf_len) % USB_HIGH_SPEED_BULK_SIZE) ? true : false; else diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index 10c33e2ae3bc..cd7f28d25c47 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -117,14 +117,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_in= terface *usb_intf) if (rt_num_in_pipes !=3D 1) goto err; =20 - if (pusbd->speed =3D=3D USB_SPEED_HIGH) { - pdvobjpriv->ishighspeed =3D true; - DBG_88E("USB_SPEED_HIGH\n"); - } else { - pdvobjpriv->ishighspeed =3D false; - DBG_88E("NON USB_SPEED_HIGH\n"); - } - /* 3 misc */ rtw_reset_continual_urb_error(pdvobjpriv); =20 --=20 2.30.2