staging: rtl8188eu: Remove inline function rtw_inc_and_chk_continual_urb_error()

rtw_inc_and_chk_continual_urb_error() is used to check if device is
removed unexpectedly, to do that we can just check status of urb in
usb_read_port_complete() and usbctrl_vendorreq() doed that by checking
return value of usb_control_msg().

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/include/usb_ops.h b/drivers/staging/rtl8188eu/include/usb_ops.h
index 79d206e4d8d67c80cd03369fe77608c5a7b6e2f5..eb934bf0f3915f208f45f3dea62c913a8b395927 100644 (file)
--- a/drivers/staging/rtl8188eu/include/usb_ops.h
+++ b/drivers/staging/rtl8188eu/include/usb_ops.h
@@ -34,25 +34,6 @@
 
 #include <usb_ops_linux.h>
 
-/*
- * Increase and check if the continual_urb_error of this @param dvobjprivei
- * is larger than MAX_CONTINUAL_URB_ERR
- * @return true:
- * @return false:
- */
-static inline int rtw_inc_and_chk_continual_urb_error(struct dvobj_priv *dvobj)
-{
-       int ret = false;
-       int value;
-       value = atomic_inc_return(&dvobj->continual_urb_error);
-       if (value > MAX_CONTINUAL_URB_ERR) {
-               DBG_88E("[dvobj:%p][ERROR] continual_urb_error:%d > %d\n",
-                       dvobj, value, MAX_CONTINUAL_URB_ERR);
-               ret = true;
-       }
-       return ret;
-}
-
 /*
 * Set the continual_urb_error of this @param dvobjprive to 0
 */

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 363f7f5551dfc0da2ceb7ca15f27f46b265d1c59..9f9bb06a17f192635c8fa77e19da947013e9734f 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -300,11 +300,6 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i
                                }
                        }
 
-                       if (rtw_inc_and_chk_continual_urb_error(dvobjpriv)) {
-                               adapt->bSurpriseRemoved = true;
-                               break;
-                       }
-
                }
 
                /*  firmware download is checksumed, don't retry */
@@ -432,15 +427,12 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
                skb_put(precvbuf->pskb, purb->actual_length);
                precvbuf->pskb = NULL;
 
-               if (rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(adapt)))
-                       adapt->bSurpriseRemoved = true;
-
                switch (purb->status) {
                case -EINVAL:
                case -EPIPE:
                case -ENODEV:
                case -ESHUTDOWN:
-                       RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bSurpriseRemoved=true\n"));
+                       adapt->bSurpriseRemoved = true;
                case -ENOENT:
                        adapt->bDriverStopped = true;
                        RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bDriverStopped=true\n"));