Commit 6a4bcaf1 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove RT_TRACE calls from core/rtw_led.c 



Remove RT_TRACE macro calls from core/rtw_led.c, so that ultimately the
macro definition itself can eventually be removed.

Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210801190437.82017-14-phil@philpotter.co.uk


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

drivers/staging/r8188eu/core/rtw_led.c

+12 −70
Original line number Diff line number Diff line
@@ -89,13 +89,10 @@ static void SwLedBlink(struct LED_871x *pLed) 
	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON) {

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn on\n", pLed->BlinkTimes));

	} else {

	else

		SwLedOff(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn off\n", pLed->BlinkTimes));

	}



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

	pLed->BlinkTimes--;
@@ -170,13 +167,10 @@ static void SwLedBlink1(struct LED_871x *pLed) 
	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON) {

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn on\n", pLed->BlinkTimes));

	} else {

	else

		SwLedOff(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn off\n", pLed->BlinkTimes));

	}



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

		SwLedOff(padapter, pLed);
@@ -212,7 +206,6 @@ static void SwLedBlink1(struct LED_871x *pLed) 
				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&(pLed->BlinkTimer), 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;

				pLed->CurrLedState = LED_BLINK_SLOWLY;
@@ -221,7 +214,6 @@ static void SwLedBlink1(struct LED_871x *pLed) 
				else

					pLed->BlinkingLedState = RTW_LED_ON;

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

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

			}

			pLed->bLedScanBlinkInProgress = false;

		} else {
@@ -245,7 +237,6 @@ static void SwLedBlink1(struct LED_871x *pLed) 
				else

					pLed->BlinkingLedState = RTW_LED_ON;

				_set_timer(&(pLed->BlinkTimer), 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;

				pLed->CurrLedState = LED_BLINK_SLOWLY;
@@ -254,7 +245,6 @@ static void SwLedBlink1(struct LED_871x *pLed) 
				else

					pLed->BlinkingLedState = RTW_LED_ON;

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

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

			}

			pLed->BlinkTimes = 0;

			pLed->bLedBlinkInProgress = false;
@@ -287,7 +277,6 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			else

				pLed->BlinkingLedState = RTW_LED_ON;

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

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



			pLed->bLedWPSBlinkInProgress = false;

		} else {
@@ -307,13 +296,10 @@ static void SwLedBlink2(struct LED_871x *pLed) 
	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON) {

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn on\n", pLed->BlinkTimes));

	} else {

	else

		SwLedOff(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn off\n", pLed->BlinkTimes));

	}



	switch (pLed->CurrLedState) {

	case LED_BLINK_SCAN:
@@ -327,13 +313,10 @@ static void SwLedBlink2(struct LED_871x *pLed) 
				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				SwLedOn(padapter, pLed);

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



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

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;

				SwLedOff(padapter, pLed);

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

			}

			pLed->bLedScanBlinkInProgress = false;

		} else {
@@ -359,12 +342,10 @@ static void SwLedBlink2(struct LED_871x *pLed) 
				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				SwLedOn(padapter, pLed);

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

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

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;

				SwLedOff(padapter, pLed);

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

			}

			pLed->bLedBlinkInProgress = false;

		} else {
@@ -393,11 +374,9 @@ static void SwLedBlink3(struct LED_871x *pLed) 
	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON) {

		SwLedOn(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn on\n", pLed->BlinkTimes));

	} else {

		if (pLed->CurrLedState != LED_BLINK_WPS_STOP)

			SwLedOff(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn off\n", pLed->BlinkTimes));

	}



	switch (pLed->CurrLedState) {
@@ -413,13 +392,11 @@ static void SwLedBlink3(struct LED_871x *pLed) 
				pLed->BlinkingLedState = RTW_LED_ON;

				if (!pLed->bLedOn)

					SwLedOn(padapter, pLed);

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

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

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;

				if (pLed->bLedOn)

					SwLedOff(padapter, pLed);

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

			}

			pLed->bLedScanBlinkInProgress = false;

		} else {
@@ -446,14 +423,12 @@ static void SwLedBlink3(struct LED_871x *pLed) 
				pLed->BlinkingLedState = RTW_LED_ON;

				if (!pLed->bLedOn)

					SwLedOn(padapter, pLed);

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

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

				pLed->CurrLedState = RTW_LED_OFF;

				pLed->BlinkingLedState = RTW_LED_OFF;



				if (pLed->bLedOn)

					SwLedOff(padapter, pLed);

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

			}

			pLed->bLedBlinkInProgress = false;

		} else {
@@ -490,7 +465,6 @@ static void SwLedBlink3(struct LED_871x *pLed) 
				pLed->CurrLedState = RTW_LED_ON;

				pLed->BlinkingLedState = RTW_LED_ON;

				SwLedOn(padapter, pLed);

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

			}

			pLed->bLedWPSBlinkInProgress = false;

		}
@@ -508,13 +482,10 @@ static void SwLedBlink4(struct LED_871x *pLed) 
	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON) {

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn on\n", pLed->BlinkTimes));

	} else {

	else

		SwLedOff(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn off\n", pLed->BlinkTimes));

	}



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

		pLed1->BlinkingLedState = RTW_LED_OFF;
@@ -639,7 +610,6 @@ static void SwLedBlink4(struct LED_871x *pLed) 
	default:

		break;

	}

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

}



static void SwLedBlink5(struct LED_871x *pLed)
@@ -648,13 +618,10 @@ static void SwLedBlink5(struct LED_871x *pLed) 
	u8 bStopBlinking = false;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON) {

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn on\n", pLed->BlinkTimes));

	} else {

	else

		SwLedOff(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn off\n", pLed->BlinkTimes));

	}



	switch (pLed->CurrLedState) {

	case LED_BLINK_SCAN:
@@ -723,8 +690,6 @@ static void SwLedBlink5(struct LED_871x *pLed) 
	default:

		break;

	}



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

}



static void SwLedBlink6(struct LED_871x *pLed)
@@ -732,15 +697,10 @@ static void SwLedBlink6(struct LED_871x *pLed) 
	struct adapter *padapter = pLed->padapter;



	/*  Change LED according to BlinkingLedState specified. */

	if (pLed->BlinkingLedState == RTW_LED_ON) {

	if (pLed->BlinkingLedState == RTW_LED_ON)

		SwLedOn(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn on\n", pLed->BlinkTimes));

	} else {

	else

		SwLedOff(padapter, pLed);

		RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn off\n", pLed->BlinkTimes));

	}



	RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("<==== blink6\n"));

}



 /* ALPHA, added by chiyoko, 20090106 */
@@ -946,8 +906,6 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
	default:

		break;

	}



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

}



 /* Arcadyan/Sitecom , added by chiyoko, 20090216 */
@@ -1031,7 +989,6 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct 
			pLed->CurrLedState = RTW_LED_ON;

			pLed->BlinkingLedState = RTW_LED_ON;

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

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

		}

		break;

	case LED_CTL_STOP_WPS_FAIL:
@@ -1042,7 +999,6 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct 
			pLed->CurrLedState = RTW_LED_OFF;

			pLed->BlinkingLedState = RTW_LED_OFF;

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

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

		}

		break;

	case LED_CTL_START_TO_LINK:
@@ -1074,8 +1030,6 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct 
	default:

		break;

	}



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

}



  /* COREGA, added by chiyoko, 20090316 */
@@ -1212,8 +1166,6 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct 
	default:

		break;

	}

	RT_TRACE(_module_rtl8712_led_c_, _drv_info_,

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

}



 /* Edimax-Belkin, added by chiyoko, 20090413 */
@@ -1478,8 +1430,6 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct 
	default:

		break;

	}



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

}



 /* Sercomm-Belkin, added by chiyoko, 20090415 */
@@ -1547,8 +1497,6 @@ SwLedControlMode5( 
	default:

		break;

	}



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

}



 /* WNC-Corega, added by chiyoko, 20090902 */
@@ -1576,8 +1524,6 @@ SwLedControlMode6( 
	default:

		break;

	}



	RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("ledcontrol 6 Led %d\n", pLed0->CurrLedState));

}



/*  */
@@ -1669,8 +1615,4 @@ void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction) 
	default:

		break;

	}



	RT_TRACE(_module_rtl8712_led_c_, _drv_info_,

		 ("LedStrategy:%d, LedAction %d\n",

		 ledpriv->LedStrategy, LedAction));

}