Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6501c8e7 authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8712: Eliminate use of _cancel_timer_ex 



Use timer API function del_timer_sync instead of driver
specific function _cancel_timer_ex as besides deactivating
a timer, it ensures that the timer is stopped on all
CPUs before the driver exists. Also, definition of function
_cancel_timer_ex is removed as it is no longer needed after
this change.

This is done using Coccinelle and semantic patch used for
this is as follows:

@@ expression x; @@

- _cancel_timer_ex (&x);
+ del_timer_sync (&x);

Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f1758d6

drivers/staging/rtl8712/os_intfs.c

+6 −7
Original line number Diff line number Diff line
@@ -263,13 +263,12 @@ static void start_drv_timers(struct _adapter *padapter) 


void r8712_stop_drv_timers(struct _adapter *padapter)

{

	_cancel_timer_ex(&padapter->mlmepriv.assoc_timer);

	_cancel_timer_ex(&padapter->securitypriv.tkip_timer);

	_cancel_timer_ex(&padapter->mlmepriv.scan_to_timer);

	_cancel_timer_ex(&padapter->mlmepriv.dhcp_timer);

	_cancel_timer_ex(&padapter->mlmepriv.wdg_timer);

	_cancel_timer_ex(&padapter->mlmepriv.sitesurveyctrl.

			 sitesurvey_ctrl_timer);

	del_timer_sync(&padapter->mlmepriv.assoc_timer);

	del_timer_sync(&padapter->securitypriv.tkip_timer);

	del_timer_sync(&padapter->mlmepriv.scan_to_timer);

	del_timer_sync(&padapter->mlmepriv.dhcp_timer);

	del_timer_sync(&padapter->mlmepriv.wdg_timer);

	del_timer_sync(&padapter->mlmepriv.sitesurveyctrl.sitesurvey_ctrl_timer);

}



static u8 init_default_value(struct _adapter *padapter)

drivers/staging/rtl8712/osdep_service.h

+0 −5
Original line number Diff line number Diff line
@@ -92,11 +92,6 @@ static inline void sleep_schedulable(int ms) 
	schedule_timeout(delta);

}



static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer)

{

	return del_timer(ptimer);

}



static inline void flush_signals_thread(void)

{

	if (signal_pending(current))

drivers/staging/rtl8712/rtl8712_led.c

+73 −73
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void InitLed871x(struct _adapter *padapter, struct LED_871x *pLed, 
 */

static void DeInitLed871x(struct LED_871x *pLed)

{

	_cancel_timer_ex(&(pLed->BlinkTimer));

	del_timer_sync(&pLed->BlinkTimer);

	/* We should reset bLedBlinkInProgress if we cancel

	 * the LedControlTimer, */

	pLed->bLedBlinkInProgress = false;
@@ -898,11 +898,11 @@ static void SwLedControlMode1(struct _adapter *padapter, 
			  IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedLinkBlinkInProgress = false;

			}

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedNoLinkBlinkInProgress = true;
@@ -921,11 +921,11 @@ static void SwLedControlMode1(struct _adapter *padapter, 
			    IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedNoLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedNoLinkBlinkInProgress = false;

			}

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedLinkBlinkInProgress = true;
@@ -946,15 +946,15 @@ static void SwLedControlMode1(struct _adapter *padapter, 
			if (IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedNoLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedNoLinkBlinkInProgress = false;

			}

			if (pLed->bLedLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				 pLed->bLedLinkBlinkInProgress = false;

			}

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedScanBlinkInProgress = true;
@@ -975,11 +975,11 @@ static void SwLedControlMode1(struct _adapter *padapter, 
			    IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedNoLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedNoLinkBlinkInProgress = false;

			}

			if (pLed->bLedLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedLinkBlinkInProgress = false;

			}

			pLed->bLedBlinkInProgress = true;
@@ -998,19 +998,19 @@ static void SwLedControlMode1(struct _adapter *padapter, 
	case LED_CTL_START_WPS_BOTTON:

		 if (pLed->bLedWPSBlinkInProgress == false) {

			if (pLed->bLedNoLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedNoLinkBlinkInProgress = false;

			}

			if (pLed->bLedLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				 pLed->bLedLinkBlinkInProgress = false;

			}

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			if (pLed->bLedScanBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedScanBlinkInProgress = false;

			}

			pLed->bLedWPSBlinkInProgress = true;
@@ -1025,23 +1025,23 @@ static void SwLedControlMode1(struct _adapter *padapter, 
		break;

	case LED_CTL_STOP_WPS:

		if (pLed->bLedNoLinkBlinkInProgress == true) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedNoLinkBlinkInProgress = false;

		}

		if (pLed->bLedLinkBlinkInProgress == true) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			 pLed->bLedLinkBlinkInProgress = false;

		}

		if (pLed->bLedBlinkInProgress == true) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		if (pLed->bLedScanBlinkInProgress == true) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedScanBlinkInProgress = false;

		}

		if (pLed->bLedWPSBlinkInProgress)

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

		else

			pLed->bLedWPSBlinkInProgress = true;

		pLed->CurrLedState = LED_BLINK_WPS_STOP;
@@ -1057,7 +1057,7 @@ static void SwLedControlMode1(struct _adapter *padapter, 
		break;

	case LED_CTL_STOP_WPS_FAIL:

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		pLed->bLedNoLinkBlinkInProgress = true;
@@ -1073,23 +1073,23 @@ static void SwLedControlMode1(struct _adapter *padapter, 
		pLed->CurrLedState = LED_OFF;

		pLed->BlinkingLedState = LED_OFF;

		if (pLed->bLedNoLinkBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedNoLinkBlinkInProgress = false;

		}

		if (pLed->bLedLinkBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedLinkBlinkInProgress = false;

		}

		if (pLed->bLedBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		if (pLed->bLedScanBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedScanBlinkInProgress = false;

		}

		mod_timer(&pLed->BlinkTimer,
@@ -1116,7 +1116,7 @@ static void SwLedControlMode2(struct _adapter *padapter, 
				return;



			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedScanBlinkInProgress = true;
@@ -1154,11 +1154,11 @@ static void SwLedControlMode2(struct _adapter *padapter, 
		pLed->CurrLedState = LED_ON;

		pLed->BlinkingLedState = LED_ON;

		if (pLed->bLedBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		if (pLed->bLedScanBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedScanBlinkInProgress = false;

		}
@@ -1170,11 +1170,11 @@ static void SwLedControlMode2(struct _adapter *padapter, 
	case LED_CTL_START_WPS_BOTTON:

		if (pLed->bLedWPSBlinkInProgress == false) {

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			if (pLed->bLedScanBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedScanBlinkInProgress = false;

			}

			pLed->bLedWPSBlinkInProgress = true;
@@ -1214,15 +1214,15 @@ static void SwLedControlMode2(struct _adapter *padapter, 
		pLed->CurrLedState = LED_OFF;

		pLed->BlinkingLedState = LED_OFF;

		if (pLed->bLedBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		if (pLed->bLedScanBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedScanBlinkInProgress = false;

		}

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		mod_timer(&pLed->BlinkTimer,
@@ -1248,7 +1248,7 @@ static void SwLedControlMode3(struct _adapter *padapter, 
			if (IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedScanBlinkInProgress = true;
@@ -1286,11 +1286,11 @@ static void SwLedControlMode3(struct _adapter *padapter, 
		pLed->CurrLedState = LED_ON;

		pLed->BlinkingLedState = LED_ON;

		if (pLed->bLedBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		if (pLed->bLedScanBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedScanBlinkInProgress = false;

		}

		mod_timer(&pLed->BlinkTimer,
@@ -1300,11 +1300,11 @@ static void SwLedControlMode3(struct _adapter *padapter, 
	case LED_CTL_START_WPS_BOTTON:

		if (pLed->bLedWPSBlinkInProgress == false) {

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			if (pLed->bLedScanBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedScanBlinkInProgress = false;

			}

			pLed->bLedWPSBlinkInProgress = true;
@@ -1319,7 +1319,7 @@ static void SwLedControlMode3(struct _adapter *padapter, 
		break;

	case LED_CTL_STOP_WPS:

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&(pLed->BlinkTimer));

			pLed->bLedWPSBlinkInProgress = false;

		} else

			pLed->bLedWPSBlinkInProgress = true;
@@ -1336,7 +1336,7 @@ static void SwLedControlMode3(struct _adapter *padapter, 
		break;

	case LED_CTL_STOP_WPS_FAIL:

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		pLed->CurrLedState = LED_OFF;
@@ -1357,15 +1357,15 @@ static void SwLedControlMode3(struct _adapter *padapter, 
		pLed->CurrLedState = LED_OFF;

		pLed->BlinkingLedState = LED_OFF;

		if (pLed->bLedBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		if (pLed->bLedScanBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedScanBlinkInProgress = false;

		}

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		mod_timer(&pLed->BlinkTimer,
@@ -1388,7 +1388,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
	case LED_CTL_START_TO_LINK:

		if (pLed1->bLedWPSBlinkInProgress) {

			pLed1->bLedWPSBlinkInProgress = false;

			_cancel_timer_ex(&(pLed1->BlinkTimer));

			del_timer_sync(&pLed1->BlinkTimer);

			pLed1->BlinkingLedState = LED_OFF;

			pLed1->CurrLedState = LED_OFF;

			if (pLed1->bLedOn)
@@ -1400,11 +1400,11 @@ static void SwLedControlMode4(struct _adapter *padapter, 
			    IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			if (pLed->bLedNoLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedNoLinkBlinkInProgress = false;

			}

			pLed->bLedStartToLinkBlinkInProgress = true;
@@ -1426,7 +1426,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
		if (LedAction == LED_CTL_LINK) {

			if (pLed1->bLedWPSBlinkInProgress) {

				pLed1->bLedWPSBlinkInProgress = false;

				_cancel_timer_ex(&(pLed1->BlinkTimer));

				del_timer_sync(&pLed1->BlinkTimer);

				pLed1->BlinkingLedState = LED_OFF;

				pLed1->CurrLedState = LED_OFF;

				if (pLed1->bLedOn)
@@ -1439,7 +1439,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
			    IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedNoLinkBlinkInProgress = true;
@@ -1460,11 +1460,11 @@ static void SwLedControlMode4(struct _adapter *padapter, 
			if (IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedNoLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedNoLinkBlinkInProgress = false;

			}

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedScanBlinkInProgress = true;
@@ -1485,7 +1485,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
			    IS_LED_WPS_BLINKING(pLed))

				return;

			if (pLed->bLedNoLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedNoLinkBlinkInProgress = false;

			}

			pLed->bLedBlinkInProgress = true;
@@ -1503,7 +1503,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
	case LED_CTL_START_WPS_BOTTON:

		if (pLed1->bLedWPSBlinkInProgress) {

			pLed1->bLedWPSBlinkInProgress = false;

			_cancel_timer_ex(&(pLed1->BlinkTimer));

			del_timer_sync(&(pLed1->BlinkTimer));

			pLed1->BlinkingLedState = LED_OFF;

			pLed1->CurrLedState = LED_OFF;

			if (pLed1->bLedOn)
@@ -1512,15 +1512,15 @@ static void SwLedControlMode4(struct _adapter *padapter, 
		}

		if (pLed->bLedWPSBlinkInProgress == false) {

			if (pLed->bLedNoLinkBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedNoLinkBlinkInProgress = false;

			}

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			if (pLed->bLedScanBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedScanBlinkInProgress = false;

			}

			pLed->bLedWPSBlinkInProgress = true;
@@ -1538,7 +1538,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
		break;

	case LED_CTL_STOP_WPS:	/*WPS connect success*/

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		pLed->bLedNoLinkBlinkInProgress = true;
@@ -1552,7 +1552,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
		break;

	case LED_CTL_STOP_WPS_FAIL:	/*WPS authentication fail*/

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		pLed->bLedNoLinkBlinkInProgress = true;
@@ -1565,7 +1565,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
			  msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));

		/*LED1 settings*/

		if (pLed1->bLedWPSBlinkInProgress)

			_cancel_timer_ex(&(pLed1->BlinkTimer));

			del_timer_sync(&pLed1->BlinkTimer);

		else

			pLed1->bLedWPSBlinkInProgress = true;

		pLed1->CurrLedState = LED_BLINK_WPS_STOP;
@@ -1578,7 +1578,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
		break;

	case LED_CTL_STOP_WPS_FAIL_OVERLAP:	/*WPS session overlap*/

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		pLed->bLedNoLinkBlinkInProgress = true;
@@ -1591,7 +1591,7 @@ static void SwLedControlMode4(struct _adapter *padapter, 
			  msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));

		/*LED1 settings*/

		if (pLed1->bLedWPSBlinkInProgress)

			_cancel_timer_ex(&(pLed1->BlinkTimer));

			del_timer_sync(&pLed1->BlinkTimer);

		else

			pLed1->bLedWPSBlinkInProgress = true;

		pLed1->CurrLedState = LED_BLINK_WPS_STOP_OVERLAP;
@@ -1607,31 +1607,31 @@ static void SwLedControlMode4(struct _adapter *padapter, 
		pLed->CurrLedState = LED_OFF;

		pLed->BlinkingLedState = LED_OFF;

		if (pLed->bLedNoLinkBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedNoLinkBlinkInProgress = false;

		}

		if (pLed->bLedLinkBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedLinkBlinkInProgress = false;

		}

		if (pLed->bLedBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		if (pLed->bLedScanBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedScanBlinkInProgress = false;

		}

		if (pLed->bLedStartToLinkBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedStartToLinkBlinkInProgress = false;

		}

		if (pLed1->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed1->BlinkTimer));

			del_timer_sync(&pLed1->BlinkTimer);

			pLed1->bLedWPSBlinkInProgress = false;

		}

		pLed1->BlinkingLedState = LED_UNKNOWN;
@@ -1671,7 +1671,7 @@ static void SwLedControlMode5(struct _adapter *padapter, 
			; /* dummy branch */

		else if (pLed->bLedScanBlinkInProgress == false) {

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedScanBlinkInProgress = true;
@@ -1705,7 +1705,7 @@ static void SwLedControlMode5(struct _adapter *padapter, 
		pLed->CurrLedState = LED_OFF;

		pLed->BlinkingLedState = LED_OFF;

		if (pLed->bLedBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		SwLedOff(padapter, pLed);
@@ -1756,7 +1756,7 @@ static void SwLedControlMode6(struct _adapter *padapter, 
	case LED_CTL_START_WPS_BOTTON:

		if (pLed->bLedWPSBlinkInProgress == false) {

			if (pLed->bLedBlinkInProgress == true) {

				_cancel_timer_ex(&(pLed->BlinkTimer));

				del_timer_sync(&pLed->BlinkTimer);

				pLed->bLedBlinkInProgress = false;

			}

			pLed->bLedWPSBlinkInProgress = true;
@@ -1772,7 +1772,7 @@ static void SwLedControlMode6(struct _adapter *padapter, 
	case LED_CTL_STOP_WPS_FAIL:

	case LED_CTL_STOP_WPS:

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		pLed->CurrLedState = LED_ON;
@@ -1784,11 +1784,11 @@ static void SwLedControlMode6(struct _adapter *padapter, 
		pLed->CurrLedState = LED_OFF;

		pLed->BlinkingLedState = LED_OFF;

		if (pLed->bLedBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedBlinkInProgress = false;

		}

		if (pLed->bLedWPSBlinkInProgress) {

			_cancel_timer_ex(&(pLed->BlinkTimer));

			del_timer_sync(&pLed->BlinkTimer);

			pLed->bLedWPSBlinkInProgress = false;

		}

		SwLedOff(padapter, pLed);

drivers/staging/rtl8712/rtl871x_mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ void r8712_ind_disconnect(struct _adapter *padapter) 
	}

	if (padapter->pwrctrlpriv.pwr_mode !=

	    padapter->registrypriv.power_mgnt) {

		_cancel_timer_ex(&pmlmepriv->dhcp_timer);

		del_timer_sync(&pmlmepriv->dhcp_timer);

		r8712_set_ps_mode(padapter, padapter->registrypriv.power_mgnt,

				  padapter->registrypriv.smart_ps);

	}

drivers/staging/rtl8712/rtl871x_pwrctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ void r8712_cpwm_int_hdl(struct _adapter *padapter, 


	if (pwrpriv->cpwm_tog == ((preportpwrstate->state) & 0x80))

		return;

	_cancel_timer_ex(&padapter->pwrctrlpriv. rpwm_check_timer);

	del_timer_sync(&padapter->pwrctrlpriv.rpwm_check_timer);

	_enter_pwrlock(&pwrpriv->lock);

	pwrpriv->cpwm = (preportpwrstate->state) & 0xf;

	if (pwrpriv->cpwm >= PS_STATE_S2) {