Commit d344819e authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove dead led blink functions 



LedStrategy is SW_LED_MODE1 in this driver. Remove led blink
functions that are not used for SW_LED_MODE1.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210924204917.6313-2-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb2c5db5

drivers/staging/r8188eu/core/rtw_led.c

+1 −523
Original line number Diff line number Diff line
@@ -76,84 +76,6 @@ void DeInitLed871x(struct LED_871x *pLed) 
	ResetLedStatus(pLed);

}



/*  */

/*	Description: */

/*		Implementation of LED blinking behavior. */

/*		It toggle off LED and schedule corresponding timer if necessary. */

/*  */



static void SwLedBlink(struct LED_871x *pLed)

{

	struct adapter *padapter = pLed->padapter;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

	else

		SwLedOff(padapter, pLed);



	/*  Determine if we shall change LED state again. */

	pLed->BlinkTimes--;

	switch (pLed->CurrLedState) {

	case LED_BLINK_NORMAL:

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;

		break;

	case LED_BLINK_StartToBlink:

		if (check_fwstate(pmlmepriv, _FW_LINKED) && check_fwstate(pmlmepriv, WIFI_STATION_STATE))

			bStopBlinking = true;

		if (check_fwstate(pmlmepriv, _FW_LINKED) &&

		    (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||

		    check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)))

			bStopBlinking = true;

		else if (pLed->BlinkTimes == 0)

			bStopBlinking = true;

		break;

	case LED_BLINK_WPS:

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;

		break;

	default:

		bStopBlinking = true;

		break;

	}



	if (bStopBlinking) {

		if (check_fwstate(pmlmepriv, _FW_LINKED) && !pLed->bLedOn) {

			SwLedOn(padapter, pLed);

		} else if (check_fwstate(pmlmepriv, _FW_LINKED) && pLed->bLedOn) {

			SwLedOff(padapter, pLed);

		}

		pLed->BlinkTimes = 0;

		pLed->bLedBlinkInProgress = false;

	} else {

		/*  Assign LED state to toggle. */

		if (pLed->BlinkingLedState == RTW_LED_ON)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;



		/*  Schedule a timer to toggle LED state. */

		switch (pLed->CurrLedState) {

		case LED_BLINK_NORMAL:

			_set_timer(&pLed->BlinkTimer, LED_BLINK_NORMAL_INTERVAL);

			break;

		case LED_BLINK_SLOWLY:

		case LED_BLINK_StartToBlink:

			_set_timer(&pLed->BlinkTimer, LED_BLINK_SLOWLY_INTERVAL);

			break;

		case LED_BLINK_WPS:

			_set_timer(&pLed->BlinkTimer, LED_BLINK_LONG_INTERVAL);

			break;

		default:

			_set_timer(&pLed->BlinkTimer, LED_BLINK_SLOWLY_INTERVAL);

			break;

		}

	}

}



static void SwLedBlink1(struct LED_871x *pLed)

{

	struct adapter *padapter = pLed->padapter;
@@ -283,420 +205,6 @@ static void SwLedBlink1(struct LED_871x *pLed) 
	}

}



static void SwLedBlink2(struct LED_871x *pLed)

{

	struct adapter *padapter = pLed->padapter;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

	else

		SwLedOff(padapter, pLed);



	switch (pLed->CurrLedState) {

	case LED_BLINK_SCAN:

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;

		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

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

				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				SwLedOn(padapter, pLed);

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

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;

				SwLedOff(padapter, pLed);

			}

			pLed->bLedScanBlinkInProgress = false;

		} else {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

			} else {

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_SCAN_INTERVAL_ALPHA);

			}

		}

		break;

	case LED_BLINK_TXRX:

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;

		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

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

				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				SwLedOn(padapter, pLed);

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

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;

				SwLedOff(padapter, pLed);

			}

			pLed->bLedBlinkInProgress = false;

		} else {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

			} else {

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_FASTER_INTERVAL_ALPHA);

			}

		}

		break;

	default:

		break;

	}

}



static void SwLedBlink3(struct LED_871x *pLed)

{

	struct adapter *padapter = pLed->padapter;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON) {

		SwLedOn(padapter, pLed);

	} else {

		if (pLed->CurrLedState != LED_BLINK_WPS_STOP)

			SwLedOff(padapter, pLed);

	}



	switch (pLed->CurrLedState) {

	case LED_BLINK_SCAN:

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;

		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

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

				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				if (!pLed->bLedOn)

					SwLedOn(padapter, pLed);

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

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;

				if (pLed->bLedOn)

					SwLedOff(padapter, pLed);

			}

			pLed->bLedScanBlinkInProgress = false;

		} else {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

			} else {

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_SCAN_INTERVAL_ALPHA);

			}

		}

		break;

	case LED_BLINK_TXRX:

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;

		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

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

				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				if (!pLed->bLedOn)

					SwLedOn(padapter, pLed);

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

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;



				if (pLed->bLedOn)

					SwLedOff(padapter, pLed);

			}

			pLed->bLedBlinkInProgress = false;

		} else {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

			} else {

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_FASTER_INTERVAL_ALPHA);

			}

		}

		break;

	case LED_BLINK_WPS:

		if (pLed->bLedOn)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;

		_set_timer(&pLed->BlinkTimer, LED_BLINK_SCAN_INTERVAL_ALPHA);

		break;

	case LED_BLINK_WPS_STOP:	/* WPS success */

		if (pLed->BlinkingLedState == RTW_LED_ON) {

			pLed->BlinkingLedState = RTW_LED_OFF;

			_set_timer(&pLed->BlinkTimer, LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA);

			bStopBlinking = false;

		} else {

			bStopBlinking = true;

		}

		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {

				SwLedOff(padapter, pLed);

			} else {

				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				SwLedOn(padapter, pLed);

			}

			pLed->bLedWPSBlinkInProgress = false;

		}

		break;

	default:

		break;

	}

}



static void SwLedBlink4(struct LED_871x *pLed)

{

	struct adapter *padapter = pLed->padapter;

	struct led_priv *ledpriv = &padapter->ledpriv;

	struct LED_871x *pLed1 = &ledpriv->SwLed1;

	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

	else

		SwLedOff(padapter, pLed);



	if (!pLed1->bLedWPSBlinkInProgress && pLed1->BlinkingLedState == LED_UNKNOWN) {

		pLed1->BlinkingLedState = RTW_LED_OFF;

		pLed1->CurrLedState = RTW_LED_OFF;

		SwLedOff(padapter, pLed1);

	}



	switch (pLed->CurrLedState) {

	case LED_BLINK_SLOWLY:

		if (pLed->bLedOn)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;

		_set_timer(&pLed->BlinkTimer, LED_BLINK_NO_LINK_INTERVAL_ALPHA);

		break;

	case LED_BLINK_StartToBlink:

		if (pLed->bLedOn) {

			pLed->BlinkingLedState = RTW_LED_OFF;

			_set_timer(&pLed->BlinkTimer, LED_BLINK_SLOWLY_INTERVAL);

		} else {

			pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&pLed->BlinkTimer, LED_BLINK_NORMAL_INTERVAL);

		}

		break;

	case LED_BLINK_SCAN:

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0)

			bStopBlinking = false;

		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) {

				SwLedOff(padapter, pLed);

			} else {

				pLed->bLedNoLinkBlinkInProgress = false;

				pLed->CurrLedState = LED_BLINK_SLOWLY;

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_NO_LINK_INTERVAL_ALPHA);

			}

			pLed->bLedScanBlinkInProgress = false;

		} else {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) {

				SwLedOff(padapter, pLed);

			} else {

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_SCAN_INTERVAL_ALPHA);

			}

		}

		break;

	case LED_BLINK_TXRX:

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;

		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) {

				SwLedOff(padapter, pLed);

			} else {

				pLed->bLedNoLinkBlinkInProgress = true;

				pLed->CurrLedState = LED_BLINK_SLOWLY;

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_NO_LINK_INTERVAL_ALPHA);

			}

			pLed->bLedBlinkInProgress = false;

		} else {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) {

				SwLedOff(padapter, pLed);

			} else {

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_FASTER_INTERVAL_ALPHA);

			}

		}

		break;

	case LED_BLINK_WPS:

		if (pLed->bLedOn) {

			pLed->BlinkingLedState = RTW_LED_OFF;

			_set_timer(&pLed->BlinkTimer, LED_BLINK_SLOWLY_INTERVAL);

		} else {

			pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&pLed->BlinkTimer, LED_BLINK_NORMAL_INTERVAL);

		}

		break;

	case LED_BLINK_WPS_STOP:	/* WPS authentication fail */

		if (pLed->bLedOn)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;



		_set_timer(&pLed->BlinkTimer, LED_BLINK_NORMAL_INTERVAL);

		break;

	case LED_BLINK_WPS_STOP_OVERLAP:	/* WPS session overlap */

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0) {

			if (pLed->bLedOn)

				pLed->BlinkTimes = 1;

			else

				bStopBlinking = true;

		}



		if (bStopBlinking) {

			pLed->BlinkTimes = 10;

			pLed->BlinkingLedState = RTW_LED_ON;

			_set_timer(&pLed->BlinkTimer, LED_BLINK_LINK_INTERVAL_ALPHA);

		} else {

			if (pLed->bLedOn)

				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;



			_set_timer(&pLed->BlinkTimer, LED_BLINK_NORMAL_INTERVAL);

		}

		break;

	default:

		break;

	}

}



static void SwLedBlink5(struct LED_871x *pLed)

{

	struct adapter *padapter = pLed->padapter;

	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

	else

		SwLedOff(padapter, pLed);



	switch (pLed->CurrLedState) {

	case LED_BLINK_SCAN:

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;



		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) {

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;

				if (pLed->bLedOn)

					SwLedOff(padapter, pLed);

			} else {

					pLed->CurrLedState = RTW_LED_ON;

					pLed->BlinkingLedState = RTW_LED_ON;

					if (!pLed->bLedOn)

						_set_timer(&pLed->BlinkTimer, LED_BLINK_FASTER_INTERVAL_ALPHA);

			}



			pLed->bLedScanBlinkInProgress = false;

		} else {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) {

				SwLedOff(padapter, pLed);

			} else {

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_SCAN_INTERVAL_ALPHA);

			}

		}

		break;

	case LED_BLINK_TXRX:

		pLed->BlinkTimes--;

		if (pLed->BlinkTimes == 0)

			bStopBlinking = true;



		if (bStopBlinking) {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) {

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;

				if (pLed->bLedOn)

					SwLedOff(padapter, pLed);

			} else {

				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				if (!pLed->bLedOn)

					_set_timer(&pLed->BlinkTimer, LED_BLINK_FASTER_INTERVAL_ALPHA);

			}



			pLed->bLedBlinkInProgress = false;

		} else {

			if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) {

				SwLedOff(padapter, pLed);

			} else {

				if (pLed->bLedOn)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&pLed->BlinkTimer, LED_BLINK_FASTER_INTERVAL_ALPHA);

			}

		}

		break;



	default:

		break;

	}

}



static void SwLedBlink6(struct LED_871x *pLed)

{

	struct adapter *padapter = pLed->padapter;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

	else

		SwLedOff(padapter, pLed);

}



 /* ALPHA, added by chiyoko, 20090106 */

static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAction)

{
@@ -1520,44 +1028,14 @@ SwLedControlMode6( 
	}

}



/*  */

/*	Description: */

/*		Handler function of LED Blinking. */

/*		We dispatch acture LED blink action according to LedStrategy. */

/*  */

void BlinkHandler(struct LED_871x *pLed)

{

	struct adapter *padapter = pLed->padapter;

	struct led_priv *ledpriv = &padapter->ledpriv;



	if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))

		return;



	switch (ledpriv->LedStrategy) {

	case SW_LED_MODE0:

		SwLedBlink(pLed);

		break;

	case SW_LED_MODE1:

	SwLedBlink1(pLed);

		break;

	case SW_LED_MODE2:

		SwLedBlink2(pLed);

		break;

	case SW_LED_MODE3:

		SwLedBlink3(pLed);

		break;

	case SW_LED_MODE4:

		SwLedBlink4(pLed);

		break;

	case SW_LED_MODE5:

		SwLedBlink5(pLed);

		break;

	case SW_LED_MODE6:

		SwLedBlink6(pLed);

		break;

	default:

		break;

	}

}



void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction)