* [PATCH 0/5] staging: r8188eu: clean up struct dvobj_priv
@ 2022-02-06 17:59 Martin Kaiser
2022-02-06 17:59 ` [PATCH 1/5] staging: r8188eu: usb_vendor_req_mutex is not used Martin Kaiser
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-02-06 17:59 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
Remove unused or unnecessary components from struct dvobj_priv.
Martin Kaiser (5):
staging: r8188eu: usb_vendor_req_mutex is not used
staging: r8188eu: dvobj_priv's signal_strength is not used
staging: r8188eu: RegUsbSS is not used
staging: r8188eu: usb_suspend_sema is initialised but not used
staging: r8188eu: remove ishighspeed from dvobj_priv
drivers/staging/r8188eu/core/rtw_iol.c | 4 +++-
drivers/staging/r8188eu/hal/usb_halinit.c | 4 ++--
drivers/staging/r8188eu/include/drv_types.h | 5 -----
drivers/staging/r8188eu/include/usb_ops.h | 2 +-
drivers/staging/r8188eu/os_dep/usb_intf.c | 9 ---------
5 files changed, 6 insertions(+), 18 deletions(-)
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/5] staging: r8188eu: usb_vendor_req_mutex is not used
2022-02-06 17:59 [PATCH 0/5] staging: r8188eu: clean up struct dvobj_priv Martin Kaiser
@ 2022-02-06 17:59 ` Martin Kaiser
2022-02-06 17:59 ` [PATCH 2/5] staging: r8188eu: dvobj_priv's signal_strength " Martin Kaiser
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-02-06 17:59 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
usb_vendor_req_mutex in struct dvobj_priv is not used.
Remove it.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/drv_types.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 987dae613d8b..7e6385109cbc 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -141,7 +141,6 @@ struct dvobj_priv {
u8 RtNumOutPipes;
int RegUsbSS;
struct semaphore usb_suspend_sema;
- struct mutex usb_vendor_req_mutex;
struct usb_interface *pusbintf;
struct usb_device *pusbdev;
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] staging: r8188eu: dvobj_priv's signal_strength is not used
2022-02-06 17:59 [PATCH 0/5] staging: r8188eu: clean up struct dvobj_priv Martin Kaiser
2022-02-06 17:59 ` [PATCH 1/5] staging: r8188eu: usb_vendor_req_mutex is not used Martin Kaiser
@ 2022-02-06 17:59 ` Martin Kaiser
2022-02-06 17:59 ` [PATCH 3/5] staging: r8188eu: RegUsbSS " Martin Kaiser
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-02-06 17:59 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
signal_strength is struct dvobj_priv is not used. Remove it.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/drv_types.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 7e6385109cbc..79ff0b25914c 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -146,7 +146,6 @@ struct dvobj_priv {
struct usb_device *pusbdev;
atomic_t continual_urb_error;
- u8 signal_strength;
};
static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] staging: r8188eu: RegUsbSS is not used
2022-02-06 17:59 [PATCH 0/5] staging: r8188eu: clean up struct dvobj_priv Martin Kaiser
2022-02-06 17:59 ` [PATCH 1/5] staging: r8188eu: usb_vendor_req_mutex is not used Martin Kaiser
2022-02-06 17:59 ` [PATCH 2/5] staging: r8188eu: dvobj_priv's signal_strength " Martin Kaiser
@ 2022-02-06 17:59 ` Martin Kaiser
2022-02-06 17:59 ` [PATCH 4/5] staging: r8188eu: usb_suspend_sema is initialised but " Martin Kaiser
2022-02-06 17:59 ` [PATCH 5/5] staging: r8188eu: remove ishighspeed from dvobj_priv Martin Kaiser
4 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-02-06 17:59 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
RegUsbSS in struct dvobj_priv is not used. Remove it.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/drv_types.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 79ff0b25914c..e3acac56ce6e 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -139,7 +139,6 @@ struct dvobj_priv {
u8 ishighspeed;
u8 RtNumOutPipes;
- int RegUsbSS;
struct semaphore usb_suspend_sema;
struct usb_interface *pusbintf;
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] staging: r8188eu: usb_suspend_sema is initialised but not used
2022-02-06 17:59 [PATCH 0/5] staging: r8188eu: clean up struct dvobj_priv Martin Kaiser
` (2 preceding siblings ...)
2022-02-06 17:59 ` [PATCH 3/5] staging: r8188eu: RegUsbSS " Martin Kaiser
@ 2022-02-06 17:59 ` Martin Kaiser
2022-02-06 17:59 ` [PATCH 5/5] staging: r8188eu: remove ishighspeed from dvobj_priv Martin Kaiser
4 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-02-06 17:59 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
usb_suspend_sema from struct dvobj_priv is initialised but never used.
Remove it.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/drv_types.h | 1 -
drivers/staging/r8188eu/os_dep/usb_intf.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index e3acac56ce6e..618a6529192b 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -139,7 +139,6 @@ struct dvobj_priv {
u8 ishighspeed;
u8 RtNumOutPipes;
- struct semaphore usb_suspend_sema;
struct usb_interface *pusbintf;
struct usb_device *pusbdev;
diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index b20d0eca12fa..10c33e2ae3bc 100644
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -126,7 +126,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
}
/* 3 misc */
- sema_init(&pdvobjpriv->usb_suspend_sema, 0);
rtw_reset_continual_urb_error(pdvobjpriv);
usb_get_dev(pusbd);
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] staging: r8188eu: remove ishighspeed from dvobj_priv
2022-02-06 17:59 [PATCH 0/5] staging: r8188eu: clean up struct dvobj_priv Martin Kaiser
` (3 preceding siblings ...)
2022-02-06 17:59 ` [PATCH 4/5] staging: r8188eu: usb_suspend_sema is initialised but " Martin Kaiser
@ 2022-02-06 17:59 ` Martin Kaiser
2022-02-08 9:30 ` Greg Kroah-Hartman
4 siblings, 1 reply; 7+ messages in thread
From: Martin Kaiser @ 2022-02-06 17:59 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
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.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_iol.c | 4 +++-
drivers/staging/r8188eu/hal/usb_halinit.c | 4 ++--
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 --------
5 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_iol.c b/drivers/staging/r8188eu/core/rtw_iol.c
index 923da2a9f6ae..26f2a6fc3f38 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 == 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/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 03966a1e247e..e3a28c443f24 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -48,7 +48,7 @@ void rtl8188eu_interface_configure(struct adapter *adapt)
struct hal_data_8188e *haldata = &adapt->haldata;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(adapt);
- if (pdvobjpriv->ishighspeed)
+ if (pdvobjpriv->pusbdev->speed == USB_SPEED_HIGH)
haldata->UsbBulkOutSize = USB_HIGH_SPEED_BULK_SIZE;/* 512 bytes */
else
haldata->UsbBulkOutSize = USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */
@@ -105,7 +105,7 @@ 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)
+ 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);
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 {
/*-------- 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 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 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 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_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);
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 5/5] staging: r8188eu: remove ishighspeed from dvobj_priv
2022-02-06 17:59 ` [PATCH 5/5] staging: r8188eu: remove ishighspeed from dvobj_priv Martin Kaiser
@ 2022-02-08 9:30 ` Greg Kroah-Hartman
0 siblings, 0 replies; 7+ messages in thread
From: Greg Kroah-Hartman @ 2022-02-08 9:30 UTC (permalink / raw)
To: Martin Kaiser
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel
On Sun, Feb 06, 2022 at 06:59:25PM +0100, Martin Kaiser wrote:
> 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.
>
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> drivers/staging/r8188eu/core/rtw_iol.c | 4 +++-
> drivers/staging/r8188eu/hal/usb_halinit.c | 4 ++--
> 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 --------
> 5 files changed, 6 insertions(+), 13 deletions(-)
This commit did not apply probably due to other changes to the driver at
the same time by other patch series. Can you rebase it and resend? The
other 4 were fine and now in my tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-02-08 9:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-06 17:59 [PATCH 0/5] staging: r8188eu: clean up struct dvobj_priv Martin Kaiser
2022-02-06 17:59 ` [PATCH 1/5] staging: r8188eu: usb_vendor_req_mutex is not used Martin Kaiser
2022-02-06 17:59 ` [PATCH 2/5] staging: r8188eu: dvobj_priv's signal_strength " Martin Kaiser
2022-02-06 17:59 ` [PATCH 3/5] staging: r8188eu: RegUsbSS " Martin Kaiser
2022-02-06 17:59 ` [PATCH 4/5] staging: r8188eu: usb_suspend_sema is initialised but " Martin Kaiser
2022-02-06 17:59 ` [PATCH 5/5] staging: r8188eu: remove ishighspeed from dvobj_priv Martin Kaiser
2022-02-08 9:30 ` Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.