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

Commit 4d4efe3e authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8188eu: Eliminate use of _set_timer 



This patch introduces the use of API function mod_timer
instead of driver specific function _set_timer as it is
a more efficient and standard way to update the expire
field of an active timer. Also, definition of function
_set_timer is removed as it is no longer needed after
this change.

Here, these cases are handled using Coccinelle and
semantic patch used for this is as follows:

@@ expression x; expression y;@@

- _set_timer (&x, y);
+ mod_timer (&x, jiffies + msecs_to_jiffies (y));

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

drivers/staging/rtl8188eu/core/rtw_cmd.c

+12 −6
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 
	if (res == _SUCCESS) {

		pmlmepriv->scan_start_time = jiffies;



		_set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT);

		mod_timer(&pmlmepriv->scan_to_timer,

			  jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));



		rtw_led_control(padapter, LED_CTL_SITE_SURVEY);
@@ -1234,9 +1235,11 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
	if (pcmd->res == H2C_DROPPED) {

		/* TODO: cancel timer and do timeout handler directly... */

		/* need to make timeout handlerOS independent */

		_set_timer(&pmlmepriv->scan_to_timer, 1);

		mod_timer(&pmlmepriv->scan_to_timer,

			  jiffies + msecs_to_jiffies(1));

	} else if (pcmd->res != H2C_SUCCESS) {

		_set_timer(&pmlmepriv->scan_to_timer, 1);

		mod_timer(&pmlmepriv->scan_to_timer,

			  jiffies + msecs_to_jiffies(1));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n."));

	}
@@ -1270,10 +1273,12 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
	if (pcmd->res == H2C_DROPPED) {

		/* TODO: cancel timer and do timeout handler directly... */

		/* need to make timeout handlerOS independent */

		_set_timer(&pmlmepriv->assoc_timer, 1);

		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));

	} else if (pcmd->res != H2C_SUCCESS) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("********Error:rtw_select_and_join_from_scanned_queue Wait Sema  Fail ************\n"));

		_set_timer(&pmlmepriv->assoc_timer, 1);

		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));

	}



	rtw_free_cmd_obj(pcmd);
@@ -1291,7 +1296,8 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 


	if (pcmd->res != H2C_SUCCESS) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback  Fail ************\n\n."));

		_set_timer(&pmlmepriv->assoc_timer, 1);

		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));

	}



	del_timer_sync(&pmlmepriv->assoc_timer);

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ u8 rtw_do_join(struct adapter *padapter) 
		select_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);

		if (select_ret == _SUCCESS) {

			pmlmepriv->to_join = false;

			_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);

			mod_timer(&pmlmepriv->assoc_timer,

				  jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));

		} else {

			if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) {

				/*  submit createbss_cmd to change to a ADHOC_MASTER */

drivers/staging/rtl8188eu/core/rtw_led.c

+38 −21
Original line number Diff line number Diff line
@@ -122,14 +122,16 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;

		_set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA);

		mod_timer(&pLed->BlinkTimer, jiffies +

			  msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));

		break;

	case LED_BLINK_NORMAL:

		if (pLed->bLedOn)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;

		_set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA);

		mod_timer(&pLed->BlinkTimer, jiffies +

			  msecs_to_jiffies(LED_BLINK_LINK_INTERVAL_ALPHA));

		break;

	case LED_BLINK_SCAN:

		pLed->BlinkTimes--;
@@ -143,7 +145,8 @@ static void SwLedBlink1(struct LED_871x *pLed) 
					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA);

				mod_timer(&pLed->BlinkTimer, jiffies +

					  msecs_to_jiffies(LED_BLINK_LINK_INTERVAL_ALPHA));

				RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("CurrLedState %d\n", pLed->CurrLedState));

			} else if (!check_fwstate(pmlmepriv, _FW_LINKED)) {

				pLed->bLedNoLinkBlinkInProgress = true;
@@ -152,7 +155,8 @@ static void SwLedBlink1(struct LED_871x *pLed) 
					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA);

				mod_timer(&pLed->BlinkTimer, jiffies +

					  msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));

				RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("CurrLedState %d\n", pLed->CurrLedState));

			}

			pLed->bLedScanBlinkInProgress = false;
@@ -161,7 +165,8 @@ static void SwLedBlink1(struct LED_871x *pLed) 
				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));

		}

		break;

	case LED_BLINK_TXRX:
@@ -176,7 +181,8 @@ static void SwLedBlink1(struct LED_871x *pLed) 
					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA);

				mod_timer(&pLed->BlinkTimer, jiffies +

					  msecs_to_jiffies(LED_BLINK_LINK_INTERVAL_ALPHA));

				RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("CurrLedState %d\n", pLed->CurrLedState));

			} else if (!check_fwstate(pmlmepriv, _FW_LINKED)) {

				pLed->bLedNoLinkBlinkInProgress = true;
@@ -185,7 +191,8 @@ static void SwLedBlink1(struct LED_871x *pLed) 
					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA);

				mod_timer(&pLed->BlinkTimer, jiffies +

					  msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));

				RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("CurrLedState %d\n", pLed->CurrLedState));

			}

			pLed->BlinkTimes = 0;
@@ -195,7 +202,8 @@ static void SwLedBlink1(struct LED_871x *pLed) 
				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_FASTER_INTERVAL_ALPHA));

		}

		break;

	case LED_BLINK_WPS:
@@ -203,7 +211,8 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;

		_set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA);

		mod_timer(&pLed->BlinkTimer, jiffies +

			  msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));

		break;

	case LED_BLINK_WPS_STOP:	/* WPS success */

		if (pLed->BlinkingLedState == RTW_LED_ON)
@@ -218,14 +227,15 @@ static void SwLedBlink1(struct LED_871x *pLed) 
				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_LINK_INTERVAL_ALPHA));

			RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("CurrLedState %d\n", pLed->CurrLedState));



			pLed->bLedWPSBlinkInProgress = false;

		} else {

			pLed->BlinkingLedState = RTW_LED_OFF;

			_set_timer(&(pLed->BlinkTimer),

				   LED_BLINK_WPS_SUCCESS_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_WPS_SUCCESS_INTERVAL_ALPHA));

		}

		break;

	default:
@@ -262,7 +272,8 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));

		}

		break;

	case LED_CTL_LINK:
@@ -283,7 +294,8 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_LINK_INTERVAL_ALPHA));

		}

		break;

	case LED_CTL_SITE_SURVEY:
@@ -311,7 +323,8 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));

		 }

		break;

	case LED_CTL_TX:
@@ -334,7 +347,8 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_FASTER_INTERVAL_ALPHA));

		}

		break;

	case LED_CTL_START_WPS: /* wait until xinpin finish */
@@ -362,7 +376,8 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));

		 }

		break;

	case LED_CTL_STOP_WPS:
@@ -389,11 +404,12 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
		pLed->CurrLedState = LED_BLINK_WPS_STOP;

		if (pLed->bLedOn) {

			pLed->BlinkingLedState = RTW_LED_OFF;

			_set_timer(&(pLed->BlinkTimer),

				   LED_BLINK_WPS_SUCCESS_INTERVAL_ALPHA);

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_WPS_SUCCESS_INTERVAL_ALPHA));

		} else {

			pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&(pLed->BlinkTimer), 0);

			mod_timer(&pLed->BlinkTimer,

				  jiffies + msecs_to_jiffies(0));

		}

		break;

	case LED_CTL_STOP_WPS_FAIL:
@@ -407,7 +423,8 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;

		_set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA);

		mod_timer(&pLed->BlinkTimer, jiffies +

			  msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));

		break;

	case LED_CTL_POWER_OFF:

		pLed->CurrLedState = RTW_LED_OFF;

drivers/staging/rtl8188eu/core/rtw_mlme.c

+10 −5
Original line number Diff line number Diff line
@@ -665,7 +665,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) 
				set_fwstate(pmlmepriv, _FW_UNDER_LINKING);



				if (rtw_select_and_join_from_scanned_queue(pmlmepriv) == _SUCCESS) {

					_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);

					mod_timer(&pmlmepriv->assoc_timer,

						  jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));

				} else {

					struct wlan_bssid_ex    *pdev_network = &(adapter->registrypriv.dev_network);

					u8 *pibss = adapter->registrypriv.dev_network.MacAddress;
@@ -692,7 +693,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) 
			pmlmepriv->to_join = false;

			s_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);

			if (_SUCCESS == s_ret) {

			     _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);

			     mod_timer(&pmlmepriv->assoc_timer,

				       jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));

			} else if (s_ret == 2) { /* there is no need to wait for join */

				_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

				rtw_indicate_connect(adapter);
@@ -1127,14 +1129,16 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 


	} else if (pnetwork->join_res == -4) {

		rtw_reset_securitypriv(adapter);

		_set_timer(&pmlmepriv->assoc_timer, 1);

		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));



		if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == true) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("fail! clear _FW_UNDER_LINKING ^^^fw_state=%x\n", get_fwstate(pmlmepriv)));

			_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

		}

	} else { /* if join_res < 0 (join fails), then try again */

		_set_timer(&pmlmepriv->assoc_timer, 1);

		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));

		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

	}
@@ -1449,7 +1453,8 @@ void rtw_dynamic_check_timer_handlder(void *function_context) 
		rtw_auto_scan_handler(adapter);

	}

exit:

	_set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);

	mod_timer(&adapter->mlmepriv.dynamic_chk_timer,

		  jiffies + msecs_to_jiffies(2000));

}



#define RTW_SCAN_RESULT_EXPIRE 2000

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+4 −3
Original line number Diff line number Diff line
@@ -3972,8 +3972,8 @@ void start_clnt_join(struct adapter *padapter) 
		/* and enable a timer */

		beacon_timeout = decide_wait_for_beacon_timeout(pmlmeinfo->bcn_interval);

		set_link_timer(pmlmeext, beacon_timeout);

		_set_timer(&padapter->mlmepriv.assoc_timer,

			   (REAUTH_TO * REAUTH_LIMIT) + (REASSOC_TO*REASSOC_LIMIT) + beacon_timeout);

		mod_timer(&padapter->mlmepriv.assoc_timer, jiffies +

			  msecs_to_jiffies((REAUTH_TO * REAUTH_LIMIT) + (REASSOC_TO * REASSOC_LIMIT) + beacon_timeout));



		pmlmeinfo->state = WIFI_FW_AUTH_NULL | WIFI_FW_STATION_STATE;

	} else if (caps&cap_IBSS) { /* adhoc client */
@@ -5406,7 +5406,8 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf) 
	if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) ||

	    ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) {

		issue_action_BA(padapter, pparm->addr, RTW_WLAN_ACTION_ADDBA_REQ, (u16)pparm->tid);

		_set_timer(&psta->addba_retry_timer, ADDBA_TO);

		mod_timer(&psta->addba_retry_timer,

			  jiffies + msecs_to_jiffies(ADDBA_TO));

	} else {

		psta->htpriv.candidate_tid_bitmap &= ~BIT(pparm->tid);

	}