[PATCH 16/17] staging: rtl8723bs: Remove constant result macro get_iface_type

From: Philipp Hortmann
Date: Sun Sep 15 2024 - 02:44:04 EST


Remove macro get_iface_type that returns always false to shorten code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 +--
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ----
drivers/staging/rtl8723bs/include/drv_types.h | 1 -
3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index bbdd5fce28a1..a6383f615686 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -4872,8 +4872,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
/* set_link_timer(pmlmeext, DISCONNECT_TO); */
}

- if (get_iface_type(padapter) == IFACE_PORT0)
- rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0);
+ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0);
}

/* currently only adhoc mode will go here */
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 6ddd73b9cb29..c60e179bb2e1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -452,10 +452,6 @@ void LPS_Enter(struct adapter *padapter, const char *msg)
if (n_assoc_iface != 1)
return;

- /* Skip lps enter request for adapter not port0 */
- if (get_iface_type(padapter) != IFACE_PORT0)
- return;
-
if (!PS_RDY_CHECK(dvobj->padapters))
return;

diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 2b12a2313707..57cbe2876838 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -182,7 +182,6 @@ struct registry_priv {

#include <drv_types_sdio.h>

-#define get_iface_type(adapter) (IFACE_PORT0)
#define GET_PRIMARY_ADAPTER(padapter) (((struct adapter *)padapter)->dvobj->if1)
#define GET_IFACE_NUMS(padapter) (((struct adapter *)padapter)->dvobj->iface_nums)
#define GET_ADAPTER(padapter, iface_id) (((struct adapter *)padapter)->dvobj->padapters[iface_id])
--
2.43.0