staging: rtl8723bs: remove unused sys interrupt
v2 cover staging: rtl8723bs: remove unused sys interrupt
This series removes fields 'SysIntrStatus' and 'SysIntrMask' from struct hal_com_data.
'SysIntrStatus' is actually unused. 'SysIntrMask' is initialized to zero and never changes.
Changes in v2:
- update the commit message in patch 3
Nikolay Kulikov (4):
staging: rtl8723bs: remove unused SysIntrMask from struct hal_com_data
staging: rtl8723bs: remove empty InitSysInterrupt8723BSdio()
staging: rtl8723bs: remove overwriting of current IMR settings
staging: rtl8723bs: remove unused SysIntrStatus from struct
hal_com_data
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 ----- drivers/staging/rtl8723bs/hal/sdio_ops.c | 20 -------------------- drivers/staging/rtl8723bs/include/hal_data.h | 4 ---- drivers/staging/rtl8723bs/include/sdio_ops.h | 1 - 4 files changed, 30 deletions(-)
base-commit: 6abf0b2df0b1c2205a4c0591425e6461afa62edb
Signature · 1 line
2.54.0
PATCH v2 1/4 staging: rtl8723bs: remove unused SysIntrMask from struct hal_com_data
This field is set to 0 once, and its use becomes optional. Remove it to clean up dead code.
--- drivers/staging/rtl8723bs/hal/sdio_ops.c | 4 +--- drivers/staging/rtl8723bs/include/hal_data.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_ops.c +1 -3
@@ -592,8 +592,6 @@ void InitSysInterrupt8723BSdio(struct adapter *adapter)struct hal_com_data *haldata; haldata =GET_HAL_DATA (adapter); - - haldata->SysIntrMask = (0 ); }/*
@@ -616,7 +614,7 @@ void rtw_sdio_enable_interrupt(struct adapter *adapter)/* Update current system IMR settings */ tmp =rtw_read32 (adapter,REG_HSIMR ); -rtw_write32 (adapter,REG_HSIMR , tmp | haldata->SysIntrMask); +rtw_write32 (adapter,REG_HSIMR , tmp);/* */ /* <Roger_Notes> There are some C2H CMDs have been sent before system interrupt is enabled, e.g., C2H, CPWM. */
drivers/staging/rtl8723bs/include/hal_data.h +0 -1
@@ -389,7 +389,6 @@ struct hal_com_data {/* Interrupt related register information. */ u32 SysIntrStatus; -u32 SysIntrMask;/* Chip version information */ bool chip_normal;/* true - normal chip, false - test chip */
Signature · 1 line
2.54.0
PATCH v2 2/4 staging: rtl8723bs: remove empty InitSysInterrupt8723BSdio()
In reply to Nikolay KulikovThis function does not do any useful work to initialize interrupt, so remove it co clean up dead code.
--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 ----- drivers/staging/rtl8723bs/hal/sdio_ops.c | 13 ------------- drivers/staging/rtl8723bs/include/sdio_ops.h | 1 - 3 files changed, 19 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -5
@@ -532,11 +532,6 @@ static void _InitInterrupt(struct adapter *padapter)/* Initialize and enable SDIO Host Interrupt. */ /* */ InitInterrupt8723BSdio (padapter); - -/* */ -/* Initialize system Host Interrupt. */ -/* */ -InitSysInterrupt8723BSdio (padapter); }static void _InitRFType (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_ops.c +0 -13
@@ -581,19 +581,6 @@ void InitInterrupt8723BSdio(struct adapter *adapter) 0); } -/* */ -/* Description: */ -/* Initialize System Host Interrupt Mask configuration variables for future use. */ -/* */ -/* Created by Roger, 2011.08.03. */ -/* */ -void InitSysInterrupt8723BSdio (struct adapter *adapter) -{ -struct hal_com_data *haldata; - - haldata =GET_HAL_DATA (adapter); -} -/* * Enable SDIO Host Interrupt Mask configuration on SDIO local domain. *
drivers/staging/rtl8723bs/include/sdio_ops.h +0 -1
@@ -26,7 +26,6 @@ extern void sd_int_hdl(struct adapter *padapter);extern u8 CheckIPSStatus (struct adapter *padapter);extern void InitInterrupt8723BSdio (struct adapter *padapter); -extern void InitSysInterrupt8723BSdio (struct adapter *padapter);void rtw_sdio_enable_interrupt (struct adapter *padapter);void rtw_sdio_disable_interrupt (struct adapter *padapter);extern u8 HalQueryTxBufferStatus8723BSdio (struct adapter *padapter);
Signature · 1 line
2.54.0
PATCH v2 3/4 staging: rtl8723bs: remove overwriting of current IMR settings
In reply to Nikolay KulikovOriginally, this code use to
Step 1: Read a value from register
Step 2: Add some bits to the value
Step 3: Write the result back to the same register
The problem was that the bits in Step 2 were always zero and didn't change the value, so I have removed that code. Now this function just reads a value and writes the same value back. It is unnecessary and can be removed.
---
Changes in v2:
- Make the commit message clearer, as suggested by Dan Carpenter
drivers/staging/rtl8723bs/hal/sdio_ops.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_ops.c +0 -5
@@ -592,17 +592,12 @@ void rtw_sdio_enable_interrupt(struct adapter *adapter) {struct hal_com_data *haldata;__le32 himr; -u32 tmp; haldata =GET_HAL_DATA (adapter); himr =cpu_to_le32 (haldata->sdio_himr);sdio_local_write (adapter,SDIO_REG_HIMR ,4 , (u8 *)&himr); -/* Update current system IMR settings */ - tmp =rtw_read32 (adapter,REG_HSIMR ); -rtw_write32 (adapter,REG_HSIMR , tmp); -/* */ /* <Roger_Notes> There are some C2H CMDs have been sent before system interrupt is enabled, e.g., C2H, CPWM. */ /* So we need to clear all C2H events that FW has notified, otherwise FW won't schedule any commands anymore. */
Signature · 1 line
2.54.0
PATCH v2 4/4 staging: rtl8723bs: remove unused SysIntrStatus from struct hal_com_data
In reply to Nikolay KulikovThis field has not been used anywhere since the driver was added, so remove it to eliminate dead code.
--- drivers/staging/rtl8723bs/include/hal_data.h | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8723bs/include/hal_data.h +0 -3
@@ -387,9 +387,6 @@ struct hal_com_data {/* For bluetooth co-existence */ struct bt_coexist bt_coexist; -/* Interrupt related register information. */ -u32 SysIntrStatus; -/* Chip version information */ bool chip_normal;/* true - normal chip, false - test chip */ };
Signature · 1 line
2.54.0