From b0d60d3dc3d3ac9a9cf2ebde5fdacbaefa2fd2c5 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sun, 26 Dec 2021 20:55:56 +0100 Subject: [PATCH] staging: r8188eu: rfoff_reason is never initialised rfoff_reason in struct pwrctrl_priv is never set, its value remains 0. Remove rfoff_reason, related defines and a check in rtw_led_control that is always false. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20211226195556.159471-22-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/core/rtw_led.c | 8 -------- drivers/staging/r8188eu/include/hal_intf.h | 6 ------ drivers/staging/r8188eu/include/rtw_pwrctrl.h | 1 - 3 files changed, 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c index 09a9676eb5032..ccd43accb7dc0 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -207,14 +207,6 @@ void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction) if (!registry_par->led_enable) return; - if ((padapter->pwrctrlpriv.rf_pwrstate != rf_on && - padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) && - (LedAction == LED_CTL_TX || LedAction == LED_CTL_RX || - LedAction == LED_CTL_SITE_SURVEY || - LedAction == LED_CTL_LINK || - LedAction == LED_CTL_NO_LINK)) - return; - switch (LedAction) { case LED_CTL_START_TO_LINK: case LED_CTL_NO_LINK: diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index 6eb630f9b6bfd..b5474d199c10f 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -100,12 +100,6 @@ enum hal_odm_variable { typedef s32 (*c2h_id_filter)(u8 id); -#define RF_CHANGE_BY_INIT 0 -#define RF_CHANGE_BY_IPS BIT(28) -#define RF_CHANGE_BY_PS BIT(29) -#define RF_CHANGE_BY_HW BIT(30) -#define RF_CHANGE_BY_SW BIT(31) - #define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse) void rtl8188eu_interface_configure(struct adapter *adapt); diff --git a/drivers/staging/r8188eu/include/rtw_pwrctrl.h b/drivers/staging/r8188eu/include/rtw_pwrctrl.h index a71f2f8f7c430..849e144c90dd6 100644 --- a/drivers/staging/r8188eu/include/rtw_pwrctrl.h +++ b/drivers/staging/r8188eu/include/rtw_pwrctrl.h @@ -57,7 +57,6 @@ struct pwrctrl_priv { u8 reg_rfoff; u8 reg_pdnmode; /* powerdown mode */ - u32 rfoff_reason; /* RF OFF Level */ u32 cur_ps_level; -- 2.30.2