* [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv
@ 2014-05-29 17:50 navin patidar
2014-05-29 17:50 ` [PATCH 02/18] staging: rtl8188eu:Remove "silent_reset_inprogress" " navin patidar
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
silentreset_mutex initialized but not being used.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_sreset.c | 1 -
drivers/staging/rtl8188eu/include/rtw_sreset.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sreset.c b/drivers/staging/rtl8188eu/core/rtw_sreset.c
index ee20d4a..b7b787e 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sreset.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sreset.c
@@ -25,7 +25,6 @@ void sreset_init_value(struct adapter *padapter)
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
- mutex_init(&psrtpriv->silentreset_mutex);
psrtpriv->silent_reset_inprogress = false;
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
psrtpriv->last_tx_time = 0;
diff --git a/drivers/staging/rtl8188eu/include/rtw_sreset.h b/drivers/staging/rtl8188eu/include/rtw_sreset.h
index 2a1244f..fbfdffb 100644
--- a/drivers/staging/rtl8188eu/include/rtw_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtw_sreset.h
@@ -24,7 +24,6 @@
#include <drv_types.h>
struct sreset_priv {
- struct mutex silentreset_mutex;
u8 silent_reset_inprogress;
u8 Wifi_Error_Status;
unsigned long last_tx_time;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 02/18] staging: rtl8188eu:Remove "silent_reset_inprogress" from struct sreset_priv
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 03/18] staging: rtl8188eu: Use rtw_hal_sreset_init() in rtw_reset_drv_sw() navin patidar
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
psrtpriv->silent_reset_inprogress is always false.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_sreset.c | 4 ----
drivers/staging/rtl8188eu/include/rtw_sreset.h | 1 -
2 files changed, 5 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sreset.c b/drivers/staging/rtl8188eu/core/rtw_sreset.c
index b7b787e..434c433 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sreset.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sreset.c
@@ -25,7 +25,6 @@ void sreset_init_value(struct adapter *padapter)
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
- psrtpriv->silent_reset_inprogress = false;
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
psrtpriv->last_tx_time = 0;
psrtpriv->last_tx_complete_time = 0;
@@ -35,7 +34,6 @@ void sreset_reset_value(struct adapter *padapter)
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
- psrtpriv->silent_reset_inprogress = false;
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
psrtpriv->last_tx_time = 0;
psrtpriv->last_tx_complete_time = 0;
@@ -49,8 +47,6 @@ u8 sreset_get_wifi_status(struct adapter *padapter)
u8 status = WIFI_STATUS_SUCCESS;
u32 val32 = 0;
- if (psrtpriv->silent_reset_inprogress)
- return status;
val32 = rtw_read32(padapter, REG_TXDMA_STATUS);
if (val32 == 0xeaeaeaea) {
psrtpriv->Wifi_Error_Status = WIFI_IF_NOT_EXIST;
diff --git a/drivers/staging/rtl8188eu/include/rtw_sreset.h b/drivers/staging/rtl8188eu/include/rtw_sreset.h
index fbfdffb..8474180 100644
--- a/drivers/staging/rtl8188eu/include/rtw_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtw_sreset.h
@@ -24,7 +24,6 @@
#include <drv_types.h>
struct sreset_priv {
- u8 silent_reset_inprogress;
u8 Wifi_Error_Status;
unsigned long last_tx_time;
unsigned long last_tx_complete_time;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 03/18] staging: rtl8188eu: Use rtw_hal_sreset_init() in rtw_reset_drv_sw()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
2014-05-29 17:50 ` [PATCH 02/18] staging: rtl8188eu:Remove "silent_reset_inprogress" " navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 04/18] staging: rtl8188eu: Remove unused function rtw_hal_sreset_reset_value() navin patidar
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
We can replace rtw_hal_sreset_reset_value() with rtw_hal_sreset_init() because
both function call sreset_reset_value() and sreset_init_value() respectively at
the end of code path, and function defination of sreset_reset_value() and
sreset_init_value() is identical.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 0e0c32d..6fe32f0 100644
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -837,8 +837,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
-
- rtw_hal_sreset_reset_value(padapter);
+ rtw_hal_sreset_init(padapter);
pwrctrlpriv->pwr_state_check_cnts = 0;
/* mlmeextpriv */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 04/18] staging: rtl8188eu: Remove unused function rtw_hal_sreset_reset_value()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
2014-05-29 17:50 ` [PATCH 02/18] staging: rtl8188eu:Remove "silent_reset_inprogress" " navin patidar
2014-05-29 17:50 ` [PATCH 03/18] staging: rtl8188eu: Use rtw_hal_sreset_init() in rtw_reset_drv_sw() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 05/18] staging: rtl8188eu: Remove unused function pointer ->sreset_reset_value navin patidar
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/hal/hal_intf.c | 6 ------
drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
2 files changed, 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index d0ac4a1..699775b 100644
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -380,12 +380,6 @@ void rtw_hal_sreset_reset(struct adapter *adapt)
adapt->HalFunc.silentreset(adapt);
}
-void rtw_hal_sreset_reset_value(struct adapter *adapt)
-{
- if (adapt->HalFunc.sreset_reset_value)
- adapt->HalFunc.sreset_reset_value(adapt);
-}
-
void rtw_hal_sreset_xmit_status_check(struct adapter *adapt)
{
if (adapt->HalFunc.sreset_xmit_status_check)
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index c59fccd..fff349f 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -369,7 +369,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter,
void rtw_hal_sreset_init(struct adapter *padapter);
void rtw_hal_sreset_reset(struct adapter *padapter);
-void rtw_hal_sreset_reset_value(struct adapter *padapter);
void rtw_hal_sreset_xmit_status_check(struct adapter *padapter);
void rtw_hal_sreset_linked_status_check(struct adapter *padapter);
u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 05/18] staging: rtl8188eu: Remove unused function pointer ->sreset_reset_value
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (2 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 04/18] staging: rtl8188eu: Remove unused function rtw_hal_sreset_reset_value() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 06/18] staging: rtl8188eu: Remove unused function reset_reset_value() navin patidar
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 -
drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 5a22c6d..070b43c 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -1872,7 +1872,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;
pHalFunc->sreset_init_value = &sreset_init_value;
- pHalFunc->sreset_reset_value = &sreset_reset_value;
pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform;
pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check;
pHalFunc->sreset_linked_status_check = &rtl8188e_sreset_linked_status_check;
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index fff349f..734e935 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -252,7 +252,6 @@ struct hal_ops {
u8 word_en, u8 *data, bool test);
void (*sreset_init_value)(struct adapter *padapter);
- void (*sreset_reset_value)(struct adapter *padapter);
void (*silentreset)(struct adapter *padapter);
void (*sreset_xmit_status_check)(struct adapter *padapter);
void (*sreset_linked_status_check) (struct adapter *padapter);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 06/18] staging: rtl8188eu: Remove unused function reset_reset_value()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (3 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 05/18] staging: rtl8188eu: Remove unused function pointer ->sreset_reset_value navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 07/18] staging: rtl8188eu: Remove function rtw_hal_sreset_xmit_status_check() navin patidar
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_sreset.c | 9 ---------
drivers/staging/rtl8188eu/include/rtw_sreset.h | 1 -
2 files changed, 10 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sreset.c b/drivers/staging/rtl8188eu/core/rtw_sreset.c
index 434c433..5bc8fe0 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sreset.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sreset.c
@@ -29,15 +29,6 @@ void sreset_init_value(struct adapter *padapter)
psrtpriv->last_tx_time = 0;
psrtpriv->last_tx_complete_time = 0;
}
-void sreset_reset_value(struct adapter *padapter)
-{
- struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
- struct sreset_priv *psrtpriv = &pHalData->srestpriv;
-
- psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
- psrtpriv->last_tx_time = 0;
- psrtpriv->last_tx_complete_time = 0;
-}
u8 sreset_get_wifi_status(struct adapter *padapter)
{
diff --git a/drivers/staging/rtl8188eu/include/rtw_sreset.h b/drivers/staging/rtl8188eu/include/rtw_sreset.h
index 8474180..af01972 100644
--- a/drivers/staging/rtl8188eu/include/rtw_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtw_sreset.h
@@ -41,7 +41,6 @@ struct sreset_priv {
#define WIFI_IF_NOT_EXIST BIT6
void sreset_init_value(struct adapter *padapter);
-void sreset_reset_value(struct adapter *padapter);
u8 sreset_get_wifi_status(struct adapter *padapter);
void sreset_set_wifi_error_status(struct adapter *padapter, u32 status);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 07/18] staging: rtl8188eu: Remove function rtw_hal_sreset_xmit_status_check()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (4 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 06/18] staging: rtl8188eu: Remove unused function reset_reset_value() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 08/18] staging: rtl8188eu: Remove unused function rtl8188e_sreset_xmit_status_check() navin patidar
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
rtw_hal_sreset_xmit_status_check() is a wrapper to call
rtl8188e_sreset_xmit_status_check(), which calls
rtl8188e_silentreset_for_specific_platform() in case of transmission has
stopped to do a silent reset and restore the transmission but
rtl8188e_silentreset_for_specific_platform() has empty defination,
so we can remove rtw_hal_sreset_xmit_status_check() because it doesn't
serve its purpose.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 --
drivers/staging/rtl8188eu/hal/hal_intf.c | 6 ------
drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
3 files changed, 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 1e0b8b4..25f1c36 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -1542,8 +1542,6 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
expire_timeout_chk(padapter);
#endif
- rtw_hal_sreset_xmit_status_check(padapter);
-
linked_status_chk(padapter);
traffic_status_watchdog(padapter);
diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index 699775b..cf03d9c 100644
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -380,12 +380,6 @@ void rtw_hal_sreset_reset(struct adapter *adapt)
adapt->HalFunc.silentreset(adapt);
}
-void rtw_hal_sreset_xmit_status_check(struct adapter *adapt)
-{
- if (adapt->HalFunc.sreset_xmit_status_check)
- adapt->HalFunc.sreset_xmit_status_check(adapt);
-}
-
void rtw_hal_sreset_linked_status_check(struct adapter *adapt)
{
if (adapt->HalFunc.sreset_linked_status_check)
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 734e935..eb7df0e 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -368,7 +368,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter,
void rtw_hal_sreset_init(struct adapter *padapter);
void rtw_hal_sreset_reset(struct adapter *padapter);
-void rtw_hal_sreset_xmit_status_check(struct adapter *padapter);
void rtw_hal_sreset_linked_status_check(struct adapter *padapter);
u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 08/18] staging: rtl8188eu: Remove unused function rtl8188e_sreset_xmit_status_check()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (5 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 07/18] staging: rtl8188eu: Remove function rtw_hal_sreset_xmit_status_check() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 09/18] staging:rtl8188eu: Remove function rtw_hal_sreset_linked_status_check() navin patidar
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Remove rtl8188e_sreset_xmit_status_check() and function pointer
->sreset_xmit_status_check pointing to it.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 -
drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c | 35 --------------------
drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
.../staging/rtl8188eu/include/rtl8188e_sreset.h | 1 -
4 files changed, 38 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 070b43c..55eaf57 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -1873,7 +1873,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->sreset_init_value = &sreset_init_value;
pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform;
- pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check;
pHalFunc->sreset_linked_status_check = &rtl8188e_sreset_linked_status_check;
pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status;
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c b/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
index 047b534..fd114c1 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
@@ -26,41 +26,6 @@ void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter)
{
}
-void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
-{
- struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
- struct sreset_priv *psrtpriv = &pHalData->srestpriv;
-
- unsigned long current_time;
- struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
- unsigned int diff_time;
- u32 txdma_status;
-
- txdma_status = rtw_read32(padapter, REG_TXDMA_STATUS);
- if (txdma_status != 0x00) {
- DBG_88E("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status);
- rtw_write32(padapter, REG_TXDMA_STATUS, txdma_status);
- rtl8188e_silentreset_for_specific_platform(padapter);
- }
- /* total xmit irp = 4 */
- current_time = jiffies;
- if (0 == pxmitpriv->free_xmitbuf_cnt) {
- diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_time);
-
- if (diff_time > 2000) {
- if (psrtpriv->last_tx_complete_time == 0) {
- psrtpriv->last_tx_complete_time = current_time;
- } else {
- diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_complete_time);
- if (diff_time > 4000) {
- DBG_88E("%s tx hang\n", __func__);
- rtl8188e_silentreset_for_specific_platform(padapter);
- }
- }
- }
- }
-}
-
void rtl8188e_sreset_linked_status_check(struct adapter *padapter)
{
u32 rx_dma_status = 0;
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index eb7df0e..85fd521 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -253,7 +253,6 @@ struct hal_ops {
void (*sreset_init_value)(struct adapter *padapter);
void (*silentreset)(struct adapter *padapter);
- void (*sreset_xmit_status_check)(struct adapter *padapter);
void (*sreset_linked_status_check) (struct adapter *padapter);
u8 (*sreset_get_wifi_status)(struct adapter *padapter);
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h b/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
index a29e695..d4f0d72 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
@@ -25,7 +25,6 @@
#include <rtw_sreset.h>
void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter);
-void rtl8188e_sreset_xmit_status_check(struct adapter *padapter);
void rtl8188e_sreset_linked_status_check(struct adapter *padapter);
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 09/18] staging:rtl8188eu: Remove function rtw_hal_sreset_linked_status_check()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (6 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 08/18] staging: rtl8188eu: Remove unused function rtl8188e_sreset_xmit_status_check() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 10/18] staging:rtl8188eu: Remove function rtl8188e_sreset_linked_status_check() navin patidar
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
rtw_hal_sreset_linked_status_check() is a wrapper to call
rtl8188e_sreset_linked_status_check(), which doesn't do anything
useful.
rtl8188e_sreset_linked_status_check() will also be removed later.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 --
drivers/staging/rtl8188eu/hal/hal_intf.c | 6 ------
drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
3 files changed, 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index f5b49f3..b2a1251 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -7549,8 +7549,6 @@ void linked_status_chk(struct adapter *padapter)
if (padapter->bRxRSSIDisplay)
_linked_rx_signal_strehgth_display(padapter);
- rtw_hal_sreset_linked_status_check(padapter);
-
if (is_client_associated_to_ap(padapter)) {
/* linked infrastructure client mode */
diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index cf03d9c..7499ceb 100644
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -380,12 +380,6 @@ void rtw_hal_sreset_reset(struct adapter *adapt)
adapt->HalFunc.silentreset(adapt);
}
-void rtw_hal_sreset_linked_status_check(struct adapter *adapt)
-{
- if (adapt->HalFunc.sreset_linked_status_check)
- adapt->HalFunc.sreset_linked_status_check(adapt);
-}
-
u8 rtw_hal_sreset_get_wifi_status(struct adapter *adapt)
{
u8 status = 0;
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 85fd521..5d67e90 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -367,7 +367,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter,
void rtw_hal_sreset_init(struct adapter *padapter);
void rtw_hal_sreset_reset(struct adapter *padapter);
-void rtw_hal_sreset_linked_status_check(struct adapter *padapter);
u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter);
int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 10/18] staging:rtl8188eu: Remove function rtl8188e_sreset_linked_status_check()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (7 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 09/18] staging:rtl8188eu: Remove function rtw_hal_sreset_linked_status_check() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 11/18] staging: rtl8188eu: Remove function rtw_hal_sreset_reset() navin patidar
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Remove rtl8188e_sreset_linked_status_check() and function pointer
->sreset_linked_status_check pointing to it.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 -
drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c | 17 -----------------
drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
drivers/staging/rtl8188eu/include/rtl8188e_sreset.h | 1 -
4 files changed, 20 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 55eaf57..a0f5172 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -1873,7 +1873,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->sreset_init_value = &sreset_init_value;
pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform;
- pHalFunc->sreset_linked_status_check = &rtl8188e_sreset_linked_status_check;
pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status;
pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar;
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c b/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
index fd114c1..7fb0f68 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
@@ -26,20 +26,3 @@ void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter)
{
}
-void rtl8188e_sreset_linked_status_check(struct adapter *padapter)
-{
- u32 rx_dma_status = 0;
- u8 fw_status = 0;
- rx_dma_status = rtw_read32(padapter, REG_RXDMA_STATUS);
- if (rx_dma_status != 0x00) {
- DBG_88E("%s REG_RXDMA_STATUS:0x%08x\n", __func__, rx_dma_status);
- rtw_write32(padapter, REG_RXDMA_STATUS, rx_dma_status);
- }
- fw_status = rtw_read8(padapter, REG_FMETHR);
- if (fw_status != 0x00) {
- if (fw_status == 1)
- DBG_88E("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !!\n", __func__, fw_status);
- else if (fw_status == 2)
- DBG_88E("%s REG_FW_STATUS (0x%02x), Condition_No_Match !!\n", __func__, fw_status);
- }
-}
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 5d67e90..c3f94d8 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -253,7 +253,6 @@ struct hal_ops {
void (*sreset_init_value)(struct adapter *padapter);
void (*silentreset)(struct adapter *padapter);
- void (*sreset_linked_status_check) (struct adapter *padapter);
u8 (*sreset_get_wifi_status)(struct adapter *padapter);
int (*IOL_exec_cmds_sync)(struct adapter *padapter,
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h b/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
index d4f0d72..eb884b7 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
@@ -25,6 +25,5 @@
#include <rtw_sreset.h>
void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter);
-void rtl8188e_sreset_linked_status_check(struct adapter *padapter);
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 11/18] staging: rtl8188eu: Remove function rtw_hal_sreset_reset()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (8 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 10/18] staging:rtl8188eu: Remove function rtl8188e_sreset_linked_status_check() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 12/18] staging: rtl8188eu: Remove function rtl8188e_silentreset_for_specific_platform() navin patidar
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
rtw_hal_sreset_reset() is a wrapper to call
rtl8188e_silentreset_for_specific_platform(), which has empty defination.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 --
drivers/staging/rtl8188eu/hal/hal_intf.c | 6 ------
drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 4 ----
4 files changed, 13 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index 155282e..260243b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -804,8 +804,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
rtw_os_xmit_schedule(adapter);
pmlmeext = &adapter->mlmeextpriv;
- if (pmlmeext->sitesurvey_res.bss_cnt == 0)
- rtw_hal_sreset_reset(adapter);
}
void rtw_dummy_event_callback(struct adapter *adapter , u8 *pbuf)
diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index 7499ceb..1afc566 100644
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -374,12 +374,6 @@ void rtw_hal_sreset_init(struct adapter *adapt)
adapt->HalFunc.sreset_init_value(adapt);
}
-void rtw_hal_sreset_reset(struct adapter *adapt)
-{
- if (adapt->HalFunc.silentreset)
- adapt->HalFunc.silentreset(adapt);
-}
-
u8 rtw_hal_sreset_get_wifi_status(struct adapter *adapt)
{
u8 status = 0;
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index c3f94d8..bed9035 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -365,7 +365,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter,
struct wlan_bssid_ex *src);
void rtw_hal_sreset_init(struct adapter *padapter);
-void rtw_hal_sreset_reset(struct adapter *padapter);
u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter);
int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame,
diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index f04aaa3..97f8b3e 100644
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -4449,10 +4449,6 @@ static int rtw_dbg_port(struct net_device *dev,
}
break;
case 0x0f:
- if (extra_arg == 0) {
- DBG_88E("###### silent reset test.......#####\n");
- rtw_hal_sreset_reset(padapter);
- }
break;
case 0x15:
{
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 12/18] staging: rtl8188eu: Remove function rtl8188e_silentreset_for_specific_platform()
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (9 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 11/18] staging: rtl8188eu: Remove function rtw_hal_sreset_reset() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 13/18] staging: rtl8188eu: Remove empty files rtl8188e_sreset.[c|h] navin patidar
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Remove rtl8188e_silentreset_for_specific_platform() and function pointer
->silentreset pointing to it.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 -
drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c | 3 ---
drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
drivers/staging/rtl8188eu/include/rtl8188e_sreset.h | 1 -
4 files changed, 6 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index a0f5172..6a9c8e2 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -1872,7 +1872,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;
pHalFunc->sreset_init_value = &sreset_init_value;
- pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform;
pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status;
pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar;
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c b/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
index 7fb0f68..f907fe0 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
@@ -22,7 +22,4 @@
#include <rtl8188e_sreset.h>
#include <rtl8188e_hal.h>
-void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter)
-{
-}
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index bed9035..ca29676 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -252,7 +252,6 @@ struct hal_ops {
u8 word_en, u8 *data, bool test);
void (*sreset_init_value)(struct adapter *padapter);
- void (*silentreset)(struct adapter *padapter);
u8 (*sreset_get_wifi_status)(struct adapter *padapter);
int (*IOL_exec_cmds_sync)(struct adapter *padapter,
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h b/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
index eb884b7..cade6d7 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
@@ -24,6 +24,5 @@
#include <drv_types.h>
#include <rtw_sreset.h>
-void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter);
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 13/18] staging: rtl8188eu: Remove empty files rtl8188e_sreset.[c|h]
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (10 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 12/18] staging: rtl8188eu: Remove function rtl8188e_silentreset_for_specific_platform() navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 14/18] staging: rtl8188eu: Remove "last_tx_time" from struct sreset_priv navin patidar
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/Makefile | 1 -
drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c | 25 -----------------
drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 3 +--
.../staging/rtl8188eu/include/rtl8188e_sreset.h | 28 --------------------
4 files changed, 1 insertion(+), 56 deletions(-)
delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
diff --git a/drivers/staging/rtl8188eu/Makefile b/drivers/staging/rtl8188eu/Makefile
index 6a138ff..260c635 100644
--- a/drivers/staging/rtl8188eu/Makefile
+++ b/drivers/staging/rtl8188eu/Makefile
@@ -44,7 +44,6 @@ r8188eu-y := \
hal/rtl8188e_phycfg.o \
hal/rtl8188e_rf6052.o \
hal/rtl8188e_rxdesc.o \
- hal/rtl8188e_sreset.o \
hal/rtl8188e_xmit.o \
hal/rtl8188eu_led.o \
hal/rtl8188eu_recv.o \
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c b/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
deleted file mode 100644
index f907fe0..0000000
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- ******************************************************************************/
-#define _RTL8188E_SRESET_C_
-
-#include <rtl8188e_sreset.h>
-#include <rtl8188e_hal.h>
-
-
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index fe3b454..c7fef7a 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -31,9 +31,8 @@
#include "rtl8188e_xmit.h"
#include "rtl8188e_cmd.h"
#include "Hal8188EPwrSeq.h"
-#include "rtl8188e_sreset.h"
#include "rtw_efuse.h"
-
+#include "rtw_sreset.h"
#include "odm_precomp.h"
/* Fw Array */
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h b/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
deleted file mode 100644
index cade6d7..0000000
--- a/drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- ******************************************************************************/
-#ifndef _RTL8188E_SRESET_H_
-#define _RTL8188E_SRESET_H_
-
-#include <osdep_service.h>
-#include <drv_types.h>
-#include <rtw_sreset.h>
-
-
-#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 14/18] staging: rtl8188eu: Remove "last_tx_time" from struct sreset_priv
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (11 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 13/18] staging: rtl8188eu: Remove empty files rtl8188e_sreset.[c|h] navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 15/18] staging: rtl8188eu: Remove "last_tx_complete_time" " navin patidar
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
value stored in variable last_tx_time isn't being used
by driver.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_sreset.c | 1 -
drivers/staging/rtl8188eu/include/rtw_sreset.h | 1 -
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 6 +-----
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sreset.c b/drivers/staging/rtl8188eu/core/rtw_sreset.c
index 5bc8fe0..cc21f3d 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sreset.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sreset.c
@@ -26,7 +26,6 @@ void sreset_init_value(struct adapter *padapter)
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
- psrtpriv->last_tx_time = 0;
psrtpriv->last_tx_complete_time = 0;
}
diff --git a/drivers/staging/rtl8188eu/include/rtw_sreset.h b/drivers/staging/rtl8188eu/include/rtw_sreset.h
index af01972..6cf792f 100644
--- a/drivers/staging/rtl8188eu/include/rtw_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtw_sreset.h
@@ -25,7 +25,6 @@
struct sreset_priv {
u8 Wifi_Error_Status;
- unsigned long last_tx_time;
unsigned long last_tx_complete_time;
};
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index ba2a8ab..4622efa 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -216,11 +216,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
pxmitbuf);/* context is pxmitbuf */
status = usb_submit_urb(purb, GFP_ATOMIC);
- if (!status) {
- struct hal_data_8188e *haldata = GET_HAL_DATA(padapter);
-
- haldata->srestpriv.last_tx_time = jiffies;
- } else {
+ if (status) {
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR);
DBG_88E("usb_write_port, status =%d\n", status);
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_write_port(): usb_submit_urb, status =%x\n", status));
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 15/18] staging: rtl8188eu: Remove "last_tx_complete_time" from struct sreset_priv
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (12 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 14/18] staging: rtl8188eu: Remove "last_tx_time" from struct sreset_priv navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 16/18] staging: rtl8188eu: Remove Hal8188EReg.h file navin patidar
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
value stored in variable last_tx_complete_time isn't being used
by driver.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_sreset.c | 1 -
drivers/staging/rtl8188eu/include/rtw_sreset.h | 1 -
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 5 -----
3 files changed, 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sreset.c b/drivers/staging/rtl8188eu/core/rtw_sreset.c
index cc21f3d..3b846d3 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sreset.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sreset.c
@@ -26,7 +26,6 @@ void sreset_init_value(struct adapter *padapter)
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
- psrtpriv->last_tx_complete_time = 0;
}
u8 sreset_get_wifi_status(struct adapter *padapter)
diff --git a/drivers/staging/rtl8188eu/include/rtw_sreset.h b/drivers/staging/rtl8188eu/include/rtw_sreset.h
index 6cf792f..580e850 100644
--- a/drivers/staging/rtl8188eu/include/rtw_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtw_sreset.h
@@ -25,7 +25,6 @@
struct sreset_priv {
u8 Wifi_Error_Status;
- unsigned long last_tx_complete_time;
};
#include <rtl8188e_hal.h>
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 4622efa..0b5fbb9 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -71,8 +71,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context;
struct adapter *padapter = pxmitbuf->padapter;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
- struct hal_data_8188e *haldata;
-
switch (pxmitbuf->flags) {
case VO_QUEUE_INX:
@@ -137,9 +135,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
}
}
- haldata = GET_HAL_DATA(padapter);
- haldata->srestpriv.last_tx_complete_time = jiffies;
-
check_completion:
rtw_sctx_done_err(&pxmitbuf->sctx,
purb->status ? RTW_SCTX_DONE_WRITE_PORT_ERR :
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 16/18] staging: rtl8188eu: Remove Hal8188EReg.h file
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (13 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 15/18] staging: rtl8188eu: Remove "last_tx_complete_time" " navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 17/18] staging: rtl8188eu: Remove unused function declaration navin patidar
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Driver doesn't need Hal8188EReg.h file.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/include/Hal8188EReg.h | 46 -----------------------
drivers/staging/rtl8188eu/include/odm_precomp.h | 1 -
2 files changed, 47 deletions(-)
delete mode 100644 drivers/staging/rtl8188eu/include/Hal8188EReg.h
diff --git a/drivers/staging/rtl8188eu/include/Hal8188EReg.h b/drivers/staging/rtl8188eu/include/Hal8188EReg.h
deleted file mode 100644
index d880b0c..0000000
--- a/drivers/staging/rtl8188eu/include/Hal8188EReg.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- ******************************************************************************/
-/* */
-/* File Name: Hal8188EReg.h */
-/* */
-/* Description: */
-/* */
-/* This file is for RTL8188E register definition. */
-/* */
-/* */
-/* */
-#ifndef __HAL_8188E_REG_H__
-#define __HAL_8188E_REG_H__
-
-/* */
-/* Register Definition */
-/* */
-#define TRX_ANTDIV_PATH 0x860
-#define RX_ANTDIV_PATH 0xb2c
-#define ODM_R_A_AGC_CORE1_8188E 0xc50
-
-
-/* */
-/* Bitmap Definition */
-/* */
-#define BIT_FA_RESET_8188E BIT0
-
-
-#endif
diff --git a/drivers/staging/rtl8188eu/include/odm_precomp.h b/drivers/staging/rtl8188eu/include/odm_precomp.h
index 2eb769b3..7cc2cc9 100644
--- a/drivers/staging/rtl8188eu/include/odm_precomp.h
+++ b/drivers/staging/rtl8188eu/include/odm_precomp.h
@@ -49,7 +49,6 @@
#include "HalHWImg8188E_MAC.h"
#include "HalHWImg8188E_RF.h"
#include "HalHWImg8188E_BB.h"
-#include "Hal8188EReg.h"
#include "odm_RegConfig8188E.h"
#include "odm_RTL8188E.h"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 17/18] staging: rtl8188eu: Remove unused function declaration
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (14 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 16/18] staging: rtl8188eu: Remove Hal8188EReg.h file navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 17:50 ` [PATCH 18/18] staging: rtl8188eu: Remove usb_vendor_req.h header file navin patidar
2014-05-29 21:48 ` [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv Dan Carpenter
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/include/usb_osintf.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/rtl8188eu/include/usb_osintf.h b/drivers/staging/rtl8188eu/include/usb_osintf.h
index 9de99ca..2dce3bf 100644
--- a/drivers/staging/rtl8188eu/include/usb_osintf.h
+++ b/drivers/staging/rtl8188eu/include/usb_osintf.h
@@ -29,9 +29,6 @@ extern int rtw_mc2u_disable;
#define USBD_HALTED(Status) ((u32)(Status) >> 30 == 3)
-u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest,
- enum rt_usb_wvalue wvalue, u8 windex, void *data,
- u8 datalen, u8 isdirectionin);
int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
void netdev_br_init(struct net_device *netdev);
void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 18/18] staging: rtl8188eu: Remove usb_vendor_req.h header file
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (15 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 17/18] staging: rtl8188eu: Remove unused function declaration navin patidar
@ 2014-05-29 17:50 ` navin patidar
2014-05-29 21:48 ` [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv Dan Carpenter
17 siblings, 0 replies; 19+ messages in thread
From: navin patidar @ 2014-05-29 17:50 UTC (permalink / raw)
To: gregkh, Larry.Finger; +Cc: devel, linux-kernel, navin patidar
driver doesn't need usb_vendor_req.h.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/include/usb_osintf.h | 1 -
drivers/staging/rtl8188eu/include/usb_vendor_req.h | 52 --------------------
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 -
3 files changed, 54 deletions(-)
delete mode 100644 drivers/staging/rtl8188eu/include/usb_vendor_req.h
diff --git a/drivers/staging/rtl8188eu/include/usb_osintf.h b/drivers/staging/rtl8188eu/include/usb_osintf.h
index 2dce3bf..292ded7 100644
--- a/drivers/staging/rtl8188eu/include/usb_osintf.h
+++ b/drivers/staging/rtl8188eu/include/usb_osintf.h
@@ -22,7 +22,6 @@
#include <osdep_service.h>
#include <drv_types.h>
-#include <usb_vendor_req.h>
extern char *rtw_initmac;
extern int rtw_mc2u_disable;
diff --git a/drivers/staging/rtl8188eu/include/usb_vendor_req.h b/drivers/staging/rtl8188eu/include/usb_vendor_req.h
deleted file mode 100644
index 7f26c8f..0000000
--- a/drivers/staging/rtl8188eu/include/usb_vendor_req.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- ******************************************************************************/
-#ifndef _USB_VENDOR_REQUEST_H_
-#define _USB_VENDOR_REQUEST_H_
-
-/* 4 Set/Get Register related wIndex/Data */
-#define RT_USB_RESET_MASK_OFF 0
-#define RT_USB_RESET_MASK_ON 1
-#define RT_USB_SLEEP_MASK_OFF 0
-#define RT_USB_SLEEP_MASK_ON 1
-#define RT_USB_LDO_ON 1
-#define RT_USB_LDO_OFF 0
-
-/* 4 Set/Get SYSCLK related wValue or Data */
-#define RT_USB_SYSCLK_32KHZ 0
-#define RT_USB_SYSCLK_40MHZ 1
-#define RT_USB_SYSCLK_60MHZ 2
-
-
-enum bt_usb_request {
- RT_USB_SET_REGISTER = 1,
- RT_USB_SET_SYSCLK = 2,
- RT_USB_GET_SYSCLK = 3,
- RT_USB_GET_REGISTER = 4
-};
-
-enum rt_usb_wvalue {
- RT_USB_RESET_MASK = 1,
- RT_USB_SLEEP_MASK = 2,
- RT_USB_USB_HRCPWM = 3,
- RT_USB_LDO = 4,
- RT_USB_BOOT_TYPE = 5
-};
-
-#endif
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 7526b98..05dce99 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -29,7 +29,6 @@
#include <linux/vmalloc.h>
#include <osdep_intf.h>
-#include <usb_vendor_req.h>
#include <usb_ops.h>
#include <usb_osintf.h>
#include <usb_hal.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
` (16 preceding siblings ...)
2014-05-29 17:50 ` [PATCH 18/18] staging: rtl8188eu: Remove usb_vendor_req.h header file navin patidar
@ 2014-05-29 21:48 ` Dan Carpenter
17 siblings, 0 replies; 19+ messages in thread
From: Dan Carpenter @ 2014-05-29 21:48 UTC (permalink / raw)
To: navin patidar; +Cc: gregkh, Larry.Finger, devel, linux-kernel
I have reviewed this patchset.
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Btw, I wish you would fold some of these patches together next time.
For example, patches 3-6 are very closely related and they should have
just been one thing.
Or the times where the change log says, "I am going to delete function
frob_frob_frob_whatever() in the next patch." Just delete it in that
patch.
But anyway, you're doing a great job. Very nice clean ups.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2014-05-29 21:50 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-29 17:50 [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv navin patidar
2014-05-29 17:50 ` [PATCH 02/18] staging: rtl8188eu:Remove "silent_reset_inprogress" " navin patidar
2014-05-29 17:50 ` [PATCH 03/18] staging: rtl8188eu: Use rtw_hal_sreset_init() in rtw_reset_drv_sw() navin patidar
2014-05-29 17:50 ` [PATCH 04/18] staging: rtl8188eu: Remove unused function rtw_hal_sreset_reset_value() navin patidar
2014-05-29 17:50 ` [PATCH 05/18] staging: rtl8188eu: Remove unused function pointer ->sreset_reset_value navin patidar
2014-05-29 17:50 ` [PATCH 06/18] staging: rtl8188eu: Remove unused function reset_reset_value() navin patidar
2014-05-29 17:50 ` [PATCH 07/18] staging: rtl8188eu: Remove function rtw_hal_sreset_xmit_status_check() navin patidar
2014-05-29 17:50 ` [PATCH 08/18] staging: rtl8188eu: Remove unused function rtl8188e_sreset_xmit_status_check() navin patidar
2014-05-29 17:50 ` [PATCH 09/18] staging:rtl8188eu: Remove function rtw_hal_sreset_linked_status_check() navin patidar
2014-05-29 17:50 ` [PATCH 10/18] staging:rtl8188eu: Remove function rtl8188e_sreset_linked_status_check() navin patidar
2014-05-29 17:50 ` [PATCH 11/18] staging: rtl8188eu: Remove function rtw_hal_sreset_reset() navin patidar
2014-05-29 17:50 ` [PATCH 12/18] staging: rtl8188eu: Remove function rtl8188e_silentreset_for_specific_platform() navin patidar
2014-05-29 17:50 ` [PATCH 13/18] staging: rtl8188eu: Remove empty files rtl8188e_sreset.[c|h] navin patidar
2014-05-29 17:50 ` [PATCH 14/18] staging: rtl8188eu: Remove "last_tx_time" from struct sreset_priv navin patidar
2014-05-29 17:50 ` [PATCH 15/18] staging: rtl8188eu: Remove "last_tx_complete_time" " navin patidar
2014-05-29 17:50 ` [PATCH 16/18] staging: rtl8188eu: Remove Hal8188EReg.h file navin patidar
2014-05-29 17:50 ` [PATCH 17/18] staging: rtl8188eu: Remove unused function declaration navin patidar
2014-05-29 17:50 ` [PATCH 18/18] staging: rtl8188eu: Remove usb_vendor_req.h header file navin patidar
2014-05-29 21:48 ` [PATCH 01/18] staging: rtl8188eu: Remove "silentreset_mutex" from struct sreset_priv Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).