staging: r8188eu: bLedOpenDrain is always true for r8188eu

Remove the bLedOpenDrain variable and code that would be executed only
if bLedOpenDrain was false.

Acked-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211205151251.6861-2-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_led.c b/drivers/staging/r8188eu/hal/rtl8188eu_led.c
index 452d4bb87abadeb84ee070becdd4801f355516bb..2dd9b4518f1376faebc8ad7d711102f28be04bdb 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_led.c
@@ -36,7 +36,6 @@ void SwLedOn(struct adapter *padapter, struct LED_871x *pLed)
 void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
 {
        u8      LedCfg;
-       struct hal_data_8188e   *pHalData = GET_HAL_DATA(padapter);
 
        if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
                goto exit;
@@ -45,16 +44,11 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
 
        switch (pLed->LedPin) {
        case LED_PIN_LED0:
-               if (pHalData->bLedOpenDrain) {
-                       /*  Open-drain arrangement for controlling the LED) */
-                       LedCfg &= 0x90; /*  Set to software control. */
-                       rtw_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));
-                       LedCfg = rtw_read8(padapter, REG_MAC_PINMUX_CFG);
-                       LedCfg &= 0xFE;
-                       rtw_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);
-               } else {
-                       rtw_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3) | BIT(5) | BIT(6)));
-               }
+               LedCfg &= 0x90; /*  Set to software control. */
+               rtw_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));
+               LedCfg = rtw_read8(padapter, REG_MAC_PINMUX_CFG);
+               LedCfg &= 0xFE;
+               rtw_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);
                break;
        case LED_PIN_LED1:
                LedCfg &= 0x0f; /*  Set to software control. */

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index e995904cf85c139e1494a827766473e93d8264a7..b1372a349e4728c87ddbb556334f3fe7736d52db 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -942,10 +942,8 @@ exit:
 static void _ReadLEDSetting(struct adapter *Adapter, u8 *PROMContent, bool AutoloadFail)
 {
        struct led_priv *pledpriv = &Adapter->ledpriv;
-       struct hal_data_8188e   *haldata = GET_HAL_DATA(Adapter);
 
        pledpriv->bRegUseLed = true;
-       haldata->bLedOpenDrain = true;/*  Support Open-drain arrangement for controlling the LED. */
 }
 
 static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail)

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 0ebfcb7320325bf578ba481aace049d2de400066..39dd547a033b8ab7c74d42d511464e7d05e7e7b5 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -221,8 +221,6 @@ struct hal_data_8188e {
        u32     AntennaRxPath;                  /*  Antenna path Rx */
        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. */