staging: rtl8188eu: Remove inline function rtw_inc_and_chk_continual_urb_error() (9463f27a) · Commits · 戴 / test

drivers/staging/rtl8188eu/include/usb_ops.h

+0 −19

Original line number	Diff line number	Diff line
		@@ -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
		*/

+1 −9

Original line number	Diff line number	Diff line
		@@ -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"));