Commit ae2d23e0 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8188eu: remove bLedOpenDrain member of hal_data_8188e structure 



bLedOpenDrain always is true.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 005aca51

drivers/staging/rtl8188eu/hal/rtl8188eu_led.c

+6 −12
Original line number Original line Diff line number Diff line
@@ -46,16 +46,12 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed) 




	LedCfg = usb_read8(padapter, REG_LEDCFG2);/* 0x4E */

	LedCfg = usb_read8(padapter, REG_LEDCFG2);/* 0x4E */





	if (padapter->HalData->bLedOpenDrain) {

	/*  Open-drain arrangement for controlling the LED) */

	/*  Open-drain arrangement for controlling the LED) */

	LedCfg &= 0x90; /*  Set to software control. */

	LedCfg &= 0x90; /*  Set to software control. */

	usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));

	usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));

	LedCfg = usb_read8(padapter, REG_MAC_PINMUX_CFG);

	LedCfg = usb_read8(padapter, REG_MAC_PINMUX_CFG);

	LedCfg &= 0xFE;

	LedCfg &= 0xFE;

	usb_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);

	usb_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);

	} else {

		usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3) | BIT(5) | BIT(6)));

	}

exit:

exit:

	pLed->bLedOn = false;

	pLed->bLedOn = false;

}

}
@@ -69,8 +65,6 @@ void rtw_hal_sw_led_init(struct adapter *padapter) 
{

{

	struct led_priv *pledpriv = &(padapter->ledpriv);

	struct led_priv *pledpriv = &(padapter->ledpriv);





	padapter->HalData->bLedOpenDrain = true;



	InitLed871x(padapter, &(pledpriv->SwLed0));

	InitLed871x(padapter, &(pledpriv->SwLed0));

}

}

drivers/staging/rtl8188eu/include/rtl8188e_hal.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -270,8 +270,6 @@ struct hal_data_8188e { 
	u8	BluetoothCoexist;

	u8	BluetoothCoexist;

	u8	ExternalPA;

	u8	ExternalPA;





	u8	bLedOpenDrain; /* Open-drain support for controlling the LED.*/



	u8	b1x1RecvCombine;	/*  for 1T1R receive combining */

	u8	b1x1RecvCombine;	/*  for 1T1R receive combining */





	u32	AcParam_BE; /* Original parameter for BE, use for EDCA turbo. */

	u32	AcParam_BE; /* Original parameter for BE, use for EDCA turbo. */