staging:r8188eu: remove bLedOpenDrain member of hal_data_8188e structure
authorIvan Safonov <insafonov@gmail.com>
Fri, 7 Oct 2016 18:01:11 +0000 (01:01 +0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Oct 2016 08:25:20 +0000 (10:25 +0200)
bLedOpenDrain always is true.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
drivers/staging/rtl8188eu/include/rtl8188e_hal.h

index a6d775b..12879af 100644 (file)
@@ -46,16 +46,12 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
 
        LedCfg = usb_read8(padapter, REG_LEDCFG2);/* 0x4E */
 
-       if (padapter->HalData->bLedOpenDrain) {
-                       /*  Open-drain arrangement for controlling the LED) */
-               LedCfg &= 0x90; /*  Set to software control. */
-               usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));
-               LedCfg = usb_read8(padapter, REG_MAC_PINMUX_CFG);
-               LedCfg &= 0xFE;
-               usb_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);
-       } else {
-               usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3) | BIT(5) | BIT(6)));
-       }
+       /*  Open-drain arrangement for controlling the LED) */
+       LedCfg &= 0x90; /*  Set to software control. */
+       usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));
+       LedCfg = usb_read8(padapter, REG_MAC_PINMUX_CFG);
+       LedCfg &= 0xFE;
+       usb_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);
 exit:
        pLed->bLedOn = false;
 }
@@ -69,8 +65,6 @@ void rtw_hal_sw_led_init(struct adapter *padapter)
 {
        struct led_priv *pledpriv = &(padapter->ledpriv);
 
-       padapter->HalData->bLedOpenDrain = true;
-
        InitLed871x(padapter, &(pledpriv->SwLed0));
 }
 
index 7c81e3f..19264a2 100644 (file)
@@ -270,8 +270,6 @@ struct hal_data_8188e {
        u8      BluetoothCoexist;
        u8      ExternalPA;
 
-       u8      bLedOpenDrain; /* Open-drain support for controlling the LED.*/
-
        u8      b1x1RecvCombine;        /*  for 1T1R receive combining */
 
        u32     AcParam_BE; /* Original parameter for BE, use for EDCA turbo. */