From e899c9176a1d0659d854802966f1b1a8e74394a6 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Thu, 26 Jun 2014 10:20:53 +0200 Subject: [PATCH] staging: rtl8723au: sreset_priv->dbg_trigger_point is never set No point carrying a bunch of code around that is never going to get called. Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/core/rtw_sreset.c | 7 ------- drivers/staging/rtl8723au/hal/rtl8723a_sreset.c | 14 -------------- drivers/staging/rtl8723au/include/rtw_sreset.h | 8 -------- 3 files changed, 29 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_sreset.c b/drivers/staging/rtl8723au/core/rtw_sreset.c index c19831cb9917..c152aefb59ea 100644 --- a/drivers/staging/rtl8723au/core/rtw_sreset.c +++ b/drivers/staging/rtl8723au/core/rtw_sreset.c @@ -37,13 +37,6 @@ void rtw_sreset_reset_value(struct rtw_adapter *padapter) psrtpriv->last_tx_complete_time = 0; } -void sreset_set_trigger_point(struct rtw_adapter *padapter, s32 tgp) -{ - struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter); - - pHalData->srestpriv.dbg_trigger_point = tgp; -} - bool rtw_sreset_inprogress(struct rtw_adapter *padapter) { struct rtw_adapter *primary_adapter = GET_PRIMARY_ADAPTER(padapter); diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_sreset.c b/drivers/staging/rtl8723au/hal/rtl8723a_sreset.c index 4374036dfede..54a08a1e148b 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_sreset.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_sreset.c @@ -52,22 +52,8 @@ void rtl8723a_sreset_xmit_status_check(struct rtw_adapter *padapter) } } } - - if (psrtpriv->dbg_trigger_point == SRESET_TGP_XMIT_STATUS) { - psrtpriv->dbg_trigger_point = SRESET_TGP_NULL; - rtw_sreset_reset(padapter); - return; - } } void rtl8723a_sreset_linked_status_check(struct rtw_adapter *padapter) { - struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter); - struct sreset_priv *psrtpriv = &pHalData->srestpriv; - - if (psrtpriv->dbg_trigger_point == SRESET_TGP_LINK_STATUS) { - psrtpriv->dbg_trigger_point = SRESET_TGP_NULL; - rtw_sreset_reset(padapter); - return; - } } diff --git a/drivers/staging/rtl8723au/include/rtw_sreset.h b/drivers/staging/rtl8723au/include/rtw_sreset.h index 47996145329c..60fa8296e1ff 100644 --- a/drivers/staging/rtl8723au/include/rtw_sreset.h +++ b/drivers/staging/rtl8723au/include/rtw_sreset.h @@ -18,19 +18,11 @@ #include #include -enum { - SRESET_TGP_NULL = 0, - SRESET_TGP_XMIT_STATUS = 1, - SRESET_TGP_LINK_STATUS = 2, -}; - struct sreset_priv { struct mutex silentreset_mutex; u8 silent_reset_inprogress; unsigned long last_tx_time; unsigned long last_tx_complete_time; - - s32 dbg_trigger_point; }; #include -- 2.20.1