staging: r8188eu: remove ishighspeed from dvobj_priv

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 <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220209192842.99399-1-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_iol.c b/drivers/staging/r8188eu/core/rtw_iol.c
index 923da2a9f6ae06f1d9f070dbe046a40af2fd50d4..f5f03160759c23d58c943d73a0b115b419548418 100644 (file)
--- 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 == adapter->registrypriv.fw_iol)
                return true;
 
-       if ((2 == adapter->registrypriv.fw_iol) && (!adapter_to_dvobj(adapter)->ishighspeed))
+       if ((2 == adapter->registrypriv.fw_iol) &&
+           (adapter_to_dvobj(adapter)->pusbdev->speed != USB_SPEED_HIGH))
                return true;
+
        return false;
 }
 

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
index 205a392a0ad38a66206874b5666c4e581f5f1192..f2555c97b0c48dd04df06fe47f450179f6692ce0 100644 (file)
--- 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;
 
-       if (pdvobjpriv->ishighspeed)
+       if (pdvobjpriv->pusbdev->speed == USB_SPEED_HIGH)
                bulksize = USB_HIGH_SPEED_BULK_SIZE;
        else
                bulksize = USB_FULL_SPEED_BULK_SIZE;

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 9bcbc275f0437c922321637b16c389a5cea99654..a2a8166ac3f983aacefed8e9635484151a7a5651 100644 (file)
--- 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 = rtw_read8(Adapter, REG_USB_SPECIAL_OPTION);
 
-       if (!adapter_to_dvobj(Adapter)->ishighspeed)
-               usb_opt = usb_opt & (~INT_BULK_SEL);
-       else
+       if (adapter_to_dvobj(Adapter)->pusbdev->speed == USB_SPEED_HIGH)
                usb_opt = usb_opt | (INT_BULK_SEL);
+       else
+               usb_opt = usb_opt & (~INT_BULK_SEL);
 
        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 618a6529192ba2241693716ce3ffe1a271af3fb6..894e70a0d506fd16e313096be615750395e49b3a 100644 (file)
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -137,7 +137,6 @@ struct dvobj_priv {
 
 /*-------- below is for USB INTERFACE --------*/
 
-       u8      ishighspeed;
        u8      RtNumOutPipes;
 
        struct usb_interface *pusbintf;

diff --git a/drivers/staging/r8188eu/include/usb_ops.h b/drivers/staging/r8188eu/include/usb_ops.h
index 0a1155bbc7b85a61aea04fabbab7ef52c96badcd..62e4706c049735da10c67fa3620d68e8720d5d38 100644 (file)
--- 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 adapter *padapter,
        u8 rst = true;
        struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
 
-       if (pdvobjpriv->ishighspeed)
+       if (pdvobjpriv->pusbdev->speed == USB_SPEED_HIGH)
                rst = (0 == (buf_len) % USB_HIGH_SPEED_BULK_SIZE) ?
                      true : false;
        else

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index 668e79a3c70e67b35b52ddd63d3b79cf1f4cd6df..ae3750a3f056c08cabb0befb18a7bfbd3b3b4a05 100644 (file)
--- 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_interface *usb_intf)
        if (rt_num_in_pipes != 1)
                goto err;
 
-       if (pusbd->speed == USB_SPEED_HIGH) {
-               pdvobjpriv->ishighspeed = true;
-               DBG_88E("USB_SPEED_HIGH\n");
-       } else {
-               pdvobjpriv->ishighspeed = false;
-               DBG_88E("NON USB_SPEED_HIGH\n");
-       }
-
        /* 3 misc */
        rtw_reset_continual_urb_error(pdvobjpriv);