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

staging: rtl8188eu: rename struct field bLedOn 



Rename field bLedOn of struct LED_871x to avoid camel case.
bLedOn -> led_on

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


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

drivers/staging/rtl8188eu/core/rtw_led.c

+18 −18
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void BlinkWorkItemCallback(struct work_struct *work) 
void ResetLedStatus(struct LED_871x *pLed)

{

	pLed->CurrLedState = RTW_LED_OFF; /*  Current LED state. */

	pLed->bLedOn = false; /*  true if LED is ON, false if LED is OFF. */

	pLed->led_on = false; /*  true if LED is ON, false if LED is OFF. */



	pLed->bLedBlinkInProgress = false; /*  true if it is blinking, false o.w.. */

	pLed->bLedWPSBlinkInProgress = false;
@@ -110,7 +110,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 


	switch (pLed->CurrLedState) {

	case LED_BLINK_SLOWLY:

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;
@@ -118,7 +118,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			  msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));

		break;

	case LED_BLINK_NORMAL:

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;
@@ -131,7 +131,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			if (check_fwstate(pmlmepriv, _FW_LINKED)) {

				pLed->bLedLinkBlinkInProgress = true;

				pLed->CurrLedState = LED_BLINK_NORMAL;

				if (pLed->bLedOn)

				if (pLed->led_on)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;
@@ -141,7 +141,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			} else if (!check_fwstate(pmlmepriv, _FW_LINKED)) {

				pLed->bLedNoLinkBlinkInProgress = true;

				pLed->CurrLedState = LED_BLINK_SLOWLY;

				if (pLed->bLedOn)

				if (pLed->led_on)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;
@@ -151,7 +151,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			}

			pLed->bLedScanBlinkInProgress = false;

		} else {

			if (pLed->bLedOn)

			if (pLed->led_on)

				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;
@@ -165,7 +165,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			if (check_fwstate(pmlmepriv, _FW_LINKED)) {

				pLed->bLedLinkBlinkInProgress = true;

				pLed->CurrLedState = LED_BLINK_NORMAL;

				if (pLed->bLedOn)

				if (pLed->led_on)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;
@@ -175,7 +175,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			} else if (!check_fwstate(pmlmepriv, _FW_LINKED)) {

				pLed->bLedNoLinkBlinkInProgress = true;

				pLed->CurrLedState = LED_BLINK_SLOWLY;

				if (pLed->bLedOn)

				if (pLed->led_on)

					pLed->BlinkingLedState = RTW_LED_OFF;

				else

					pLed->BlinkingLedState = RTW_LED_ON;
@@ -185,7 +185,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
			}

			pLed->bLedBlinkInProgress = false;

		} else {

			if (pLed->bLedOn)

			if (pLed->led_on)

				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;
@@ -194,7 +194,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
		}

		break;

	case LED_BLINK_WPS:

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;
@@ -205,7 +205,7 @@ static void SwLedBlink1(struct LED_871x *pLed) 
		if (pLed->BlinkingLedState != RTW_LED_ON) {

			pLed->bLedLinkBlinkInProgress = true;

			pLed->CurrLedState = LED_BLINK_NORMAL;

			if (pLed->bLedOn)

			if (pLed->led_on)

				pLed->BlinkingLedState = RTW_LED_OFF;

			else

				pLed->BlinkingLedState = RTW_LED_ON;
@@ -251,7 +251,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
		}

		pLed->bLedNoLinkBlinkInProgress = true;

		pLed->CurrLedState = LED_BLINK_SLOWLY;

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;
@@ -274,7 +274,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
		}

		pLed->bLedLinkBlinkInProgress = true;

		pLed->CurrLedState = LED_BLINK_NORMAL;

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;
@@ -304,7 +304,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
		pLed->bLedScanBlinkInProgress = true;

		pLed->CurrLedState = LED_BLINK_SCAN;

		pLed->BlinkTimes = 24;

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;
@@ -329,7 +329,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
		pLed->bLedBlinkInProgress = true;

		pLed->CurrLedState = LED_BLINK_TXRX;

		pLed->BlinkTimes = 2;

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;
@@ -358,7 +358,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
		}

		pLed->bLedWPSBlinkInProgress = true;

		pLed->CurrLedState = LED_BLINK_WPS;

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;
@@ -387,7 +387,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
		else

			pLed->bLedWPSBlinkInProgress = true;

		pLed->CurrLedState = LED_BLINK_WPS_STOP;

		if (pLed->bLedOn) {

		if (pLed->led_on) {

			pLed->BlinkingLedState = RTW_LED_OFF;

			mod_timer(&pLed->BlinkTimer, jiffies +

				  msecs_to_jiffies(LED_BLINK_WPS_SUCCESS_INTERVAL_ALPHA));
@@ -404,7 +404,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct 
		}

		pLed->bLedNoLinkBlinkInProgress = true;

		pLed->CurrLedState = LED_BLINK_SLOWLY;

		if (pLed->bLedOn)

		if (pLed->led_on)

			pLed->BlinkingLedState = RTW_LED_OFF;

		else

			pLed->BlinkingLedState = RTW_LED_ON;

drivers/staging/rtl8188eu/hal/rtl8188eu_led.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ void sw_led_on(struct adapter *padapter, struct LED_871x *pLed) 
		return;

	led_cfg = usb_read8(padapter, REG_LEDCFG2);

	usb_write8(padapter, REG_LEDCFG2, (led_cfg & 0xf0) | BIT(5) | BIT(6));

	pLed->bLedOn = true;

	pLed->led_on = true;

}



void sw_led_off(struct adapter *padapter, struct LED_871x *pLed)
@@ -37,7 +37,7 @@ void sw_led_off(struct adapter *padapter, struct LED_871x *pLed) 
	led_cfg &= 0xFE;

	usb_write8(padapter, REG_MAC_PINMUX_CFG, led_cfg);

exit:

	pLed->bLedOn = false;

	pLed->led_on = false;

}



void rtw_hal_sw_led_init(struct adapter *padapter)

drivers/staging/rtl8188eu/include/rtw_led.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct LED_871x { 
						   * either RTW_LED_ON or RTW_LED_OFF are.

						   */



	u8 bLedOn; /*  true if LED is ON, false if LED is OFF. */

	u8 led_on; /*  true if LED is ON, false if LED is OFF. */



	u8 bLedBlinkInProgress; /*  true if it is blinking, false o.w.. */