staging: rtl8723bs: Clean-up tasks
cover staging: rtl8723bs: Clean-up tasks
This patchset would remove unnecessary code, improve formatting and fix some warnings found by checkpatch.
Javier F. Arias (4):
staging: rtl8723bs: Remove commented code
staging: rtl8723bs: Remove duplicate blank lines
staging: rtl8723bs: Remove space before tabs
staging: rtl8723bs: Fix style in definitions
drivers/staging/rtl8723bs/hal/sdio_ops.c | 123 +++++++---------------- 1 file changed, 37 insertions(+), 86 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/4 staging: rtl8723bs: Remove commented code
Remove commented code for a cleaner file.
Issue found by checkpatch.
--- drivers/staging/rtl8723bs/hal/sdio_ops.c | 33 ------------------------ 1 file changed, 33 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_ops.c +0 -33
@@ -72,9 +72,6 @@ static u8 get_deviceid(u32 addr) devide_id =WLAN_IOREG_DEVICE_ID ;break ; -/* case 0x1027: */ -/* devide_id = SDIO_FIRMWARE_FIFO; */ -/* break; */ case 0x1031 : devide_id =WLAN_TX_HIQ_DEVICE_ID ;
@@ -93,7 +90,6 @@ static u8 get_deviceid(u32 addr)break ;default : -/* devide_id = (u8)((addr >> 13) & 0xF); */ devide_id =WLAN_IOREG_DEVICE_ID ;break ; }
@@ -440,7 +436,6 @@ static u32 sdio_read_port( oldcnt = cnt;if (cnt > psdio->block_transfer_len) cnt =_RND (cnt, psdio->block_transfer_len); -/* cnt = sdio_align_size(cnt); */ err =_sd_read (intfhdl, addr, cnt, mem);
@@ -490,7 +485,6 @@ static u32 sdio_write_port(if (cnt > psdio->block_transfer_len) cnt =_RND (cnt, psdio->block_transfer_len); -/* cnt = sdio_align_size(cnt); */ err =sd_write (intfhdl, addr, cnt, xmitbuf->pdata);
@@ -754,22 +748,6 @@ void InitInterrupt8723BSdio(struct adapter *adapter) haldata->sdio_himr = (u32)( \SDIO_HIMR_RX_REQUEST_MSK |SDIO_HIMR_AVAL_MSK | -/* SDIO_HIMR_TXERR_MSK | */ -/* SDIO_HIMR_RXERR_MSK | */ -/* SDIO_HIMR_TXFOVW_MSK | */ -/* SDIO_HIMR_RXFOVW_MSK | */ -/* SDIO_HIMR_TXBCNOK_MSK | */ -/* SDIO_HIMR_TXBCNERR_MSK | */ -/* SDIO_HIMR_BCNERLY_INT_MSK | */ -/* SDIO_HIMR_C2HCMD_MSK | */ -/* SDIO_HIMR_HSISR_IND_MSK | */ -/* SDIO_HIMR_GTINT3_IND_MSK | */ -/* SDIO_HIMR_GTINT4_IND_MSK | */ -/* SDIO_HIMR_PSTIMEOUT_MSK | */ -/* SDIO_HIMR_OCPINT_MSK | */ -/* SDIO_HIMR_ATIMEND_MSK | */ -/* SDIO_HIMR_ATIMEND_E_MSK | */ -/* SDIO_HIMR_CTWEND_MSK | */ 0 ); }
@@ -787,11 +765,6 @@ void InitSysInterrupt8723BSdio(struct adapter *adapter) haldata =GET_HAL_DATA (adapter); haldata->SysIntrMask = ( \ -/* HSIMR_GPIO12_0_INT_EN | */ -/* HSIMR_SPS_OCP_INT_EN | */ -/* HSIMR_RON_INT_EN | */ -/* HSIMR_PDNINT_EN | */ -/* HSIMR_GPIO9_INT_EN | */ 0 ); }
@@ -992,7 +965,6 @@ void sd_int_dpc(struct adapter *adapter) report.state =SdioLocalCmd52Read1Byte (adapter,SDIO_REG_HCPWM1_8723B ); -/* cpwm_int_hdl(adapter, &report); */ _set_workitem (&(pwrctl->cpwm_event)); }
@@ -1055,7 +1027,6 @@ void sd_int_dpc(struct adapter *adapter)int alloc_fail_time =0 ;u32 hisr; -/* DBG_8192C("%s: RX Request, size =%d\n", __func__, hal->SdioRxFIFOSize); */ hal->sdio_hisr ^=SDIO_HISR_RX_REQUEST ; do { hal->SdioRxFIFOSize = SdioLocalCmd52Read2Byte(adapter, SDIO_REG_RX0_REQ_LEN);
@@ -1133,14 +1104,12 @@ u8 HalQueryTxBufferStatus8723BSdio(struct adapter *adapter) {struct hal_com_data *hal;u32 numof_free_page; -/* _irql irql; */ hal =GET_HAL_DATA (adapter); numof_free_page =SdioLocalCmd53Read4Byte (adapter,SDIO_REG_FREE_TXPG ); -/* spin_lock_bh(&phal->SdioTxFIFOFreePageLock); */ memcpy (hal->SdioTxFIFOFreePage, &numof_free_page,4 ); RT_TRACE(_module_hci_ops_c_, _drv_notice_, ("%s: Free page for HIQ(%#x), MIDQ(%#x), LOWQ(%#x), PUBQ(%#x)\n",
@@ -1149,7 +1118,6 @@ u8 HalQueryTxBufferStatus8723BSdio(struct adapter *adapter) hal->SdioTxFIFOFreePage[MID_QUEUE_IDX ], hal->SdioTxFIFOFreePage[LOW_QUEUE_IDX ], hal->SdioTxFIFOFreePage[PUBLIC_QUEUE_IDX])); -/* spin_unlock_bh(&hal->SdioTxFIFOFreePageLock); */ return true; }
@@ -1190,7 +1158,6 @@ u8 RecvOnePkt(struct adapter *adapter, u32 size) recvbuf =sd_recv_rxfifo (adapter, size);if (recvbuf) { -/* printk("Completed Recv One Pkt.\n"); */ sd_rxhandler (adapter, recvbuf); res = true; }else {
Signature · 1 line
2.20.1
PATCH 2/4 staging: rtl8723bs: Remove duplicate blank lines
In reply to Javier F. AriasRemove duplicate blank lines.
--- drivers/staging/rtl8723bs/hal/sdio_ops.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_ops.c +0 -14
@@ -61,7 +61,6 @@ static u8 get_deviceid(u32 addr)u8 devide_id;u16 pseudo_id; - pseudo_id = (u16)(addr >>16 );switch (pseudo_id) {case 0x1025 :
@@ -72,7 +71,6 @@ static u8 get_deviceid(u32 addr) devide_id =WLAN_IOREG_DEVICE_ID ;break ; -case 0x1031 : devide_id =WLAN_TX_HIQ_DEVICE_ID ;break ;
@@ -107,7 +105,6 @@ static u32 _cvrt2ftaddr(const u32 addr, u8 *pdevice_id, u16 *poffset)u16 offset;u32 ftaddr; - device_id =get_deviceid (addr); offset =0 ;
@@ -426,7 +423,6 @@ static u32 sdio_read_port(u32 oldcnt;s32 err; - adapter = intfhdl->padapter; psdio = &adapter_to_dvobj (adapter)->intf_data; hal =GET_HAL_DATA (adapter);
@@ -532,7 +528,6 @@ static s32 _sdio_local_read(u8 *tmpbuf;u32 n; - intfhdl = &adapter->iopriv.intf;HalSdioGetCmdAddr8723BSdio (adapter,SDIO_LOCAL_DEVICE_ID , addr, &addr);
@@ -705,7 +700,6 @@ static s32 ReadInterrupt8723BSdio(struct adapter *adapter, u32 *phisr)u32 hisr, himr;u8 val8, hisr_len; -if (!phisr)return false;
@@ -743,7 +737,6 @@ void InitInterrupt8723BSdio(struct adapter *adapter) {struct hal_com_data *haldata; - haldata =GET_HAL_DATA (adapter); haldata->sdio_himr = (u32)( \ SDIO_HIMR_RX_REQUEST_MSK |
@@ -761,7 +754,6 @@ void InitSysInterrupt8723BSdio(struct adapter *adapter) {struct hal_com_data *haldata; - haldata =GET_HAL_DATA (adapter); haldata->SysIntrMask = ( \
@@ -869,7 +861,6 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size)struct recv_priv *recv_priv;struct recv_buf *recvbuf; -/* Patch for some SDIO Host 4 bytes issue */ /* ex. RK3188 */ readsize =RND4 (size);
@@ -911,7 +902,6 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size)return NULL ; } -/* 3 4. init recvbuf */ recvbuf->len = size; recvbuf->phead = recvbuf->pskb->head;
@@ -945,7 +935,6 @@ void sd_int_dpc(struct adapter *adapter)struct intf_hdl *intfhdl = &adapter->iopriv.intf;struct pwrctrl_priv *pwrctl; - hal =GET_HAL_DATA (adapter); dvobj =adapter_to_dvobj (adapter); pwrctl =dvobj_to_pwrctl (dvobj);
@@ -1021,7 +1010,6 @@ void sd_int_dpc(struct adapter *adapter)if (hal->sdio_hisr &SDIO_HISR_RXERR )DBG_8192C ("%s: Rx Error\n" , __func__); -if (hal->sdio_hisr &SDIO_HISR_RX_REQUEST ) {struct recv_buf *recvbuf;int alloc_fail_time =0 ;
@@ -1061,7 +1049,6 @@ void sd_int_hdl(struct adapter *adapter) {struct hal_com_data *hal; -if ( (adapter->bDriverStopped) || (adapter->bSurpriseRemoved) )
@@ -1105,7 +1092,6 @@ u8 HalQueryTxBufferStatus8723BSdio(struct adapter *adapter)struct hal_com_data *hal;u32 numof_free_page; - hal =GET_HAL_DATA (adapter); numof_free_page =SdioLocalCmd53Read4Byte (adapter,SDIO_REG_FREE_TXPG );
Signature · 1 line
2.20.1
PATCH 3/4 staging: rtl8723bs: Remove space before tabs
In reply to Javier F. AriasRemove space before tabs to fix checkpatch warning. Issue found by checkpatch.
--- drivers/staging/rtl8723bs/hal/sdio_ops.c | 66 ++++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_ops.c +33 -33
@@ -15,7 +15,7 @@/* */ /* Description: */ -/* The following mapping is for SDIO host local register space. */ +/* The following mapping is for SDIO host local register space. */ /* */ /* Creadted by Roger, 2011.01.31. */ /* */
@@ -725,13 +725,13 @@ static s32 ReadInterrupt8723BSdio(struct adapter *adapter, u32 *phisr) }/* */ -/* Description: */ -/* Initialize SDIO Host Interrupt Mask configuration variables for future use. */ +/* Description: */ +/* Initialize SDIO Host Interrupt Mask configuration variables for future use. */ /* */ -/* Assumption: */ -/* Using SDIO Local register ONLY for configuration. */ +/* Assumption: */ +/* Using SDIO Local register ONLY for configuration. */ /* */ -/* Created by Roger, 2011.02.11. */ +/* Created by Roger, 2011.02.11. */ /* */ void InitInterrupt8723BSdio (struct adapter *adapter) {
@@ -745,10 +745,10 @@ void InitInterrupt8723BSdio(struct adapter *adapter) }/* */ -/* Description: */ -/* Initialize System Host Interrupt Mask configuration variables for future use. */ +/* Description: */ +/* Initialize System Host Interrupt Mask configuration variables for future use. */ /* */ -/* Created by Roger, 2011.08.03. */ +/* Created by Roger, 2011.08.03. */ /* */ void InitSysInterrupt8723BSdio (struct adapter *adapter) {
@@ -761,14 +761,14 @@ void InitSysInterrupt8723BSdio(struct adapter *adapter) }/* */ -/* Description: */ -/* Enalbe SDIO Host Interrupt Mask configuration on SDIO local domain. */ +/* Description: */ +/* Enalbe SDIO Host Interrupt Mask configuration on SDIO local domain. */ /* */ -/* Assumption: */ -/* 1. Using SDIO Local register ONLY for configuration. */ -/* 2. PASSIVE LEVEL */ +/* Assumption: */ +/* 1. Using SDIO Local register ONLY for configuration. */ +/* 2. PASSIVE LEVEL */ /* */ -/* Created by Roger, 2011.02.11. */ +/* Created by Roger, 2011.02.11. */ /* */ void EnableInterrupt8723BSdio (struct adapter *adapter) {
@@ -814,13 +814,13 @@ void EnableInterrupt8723BSdio(struct adapter *adapter) }/* */ -/* Description: */ -/* Disable SDIO Host IMR configuration to mask unnecessary interrupt service. */ +/* Description: */ +/* Disable SDIO Host IMR configuration to mask unnecessary interrupt service. */ /* */ -/* Assumption: */ -/* Using SDIO Local register ONLY for configuration. */ +/* Assumption: */ +/* Using SDIO Local register ONLY for configuration. */ /* */ -/* Created by Roger, 2011.02.11. */ +/* Created by Roger, 2011.02.11. */ /* */ void DisableInterrupt8723BSdio (struct adapter *adapter) {
@@ -831,13 +831,13 @@ void DisableInterrupt8723BSdio(struct adapter *adapter) }/* */ -/* Description: */ -/* Using 0x100 to check the power status of FW. */ +/* Description: */ +/* Using 0x100 to check the power status of FW. */ /* */ -/* Assumption: */ -/* Using SDIO Local register ONLY for configuration. */ +/* Assumption: */ +/* Using SDIO Local register ONLY for configuration. */ /* */ -/* Created by Isaac, 2013.09.10. */ +/* Created by Isaac, 2013.09.10. */ /* */ u8 CheckIPSStatus (struct adapter *adapter) {
@@ -1078,14 +1078,14 @@ void sd_int_hdl(struct adapter *adapter) }/* */ -/* Description: */ -/* Query SDIO Local register to query current the number of Free TxPacketBuffer page. */ +/* Description: */ +/* Query SDIO Local register to query current the number of Free TxPacketBuffer page. */ /* */ -/* Assumption: */ -/* 1. Running at PASSIVE_LEVEL */ -/* 2. RT_TX_SPINLOCK is NOT acquired. */ +/* Assumption: */ +/* 1. Running at PASSIVE_LEVEL */ +/* 2. RT_TX_SPINLOCK is NOT acquired. */ /* */ -/* Created by Roger, 2011.01.28. */ +/* Created by Roger, 2011.01.28. */ /* */ u8 HalQueryTxBufferStatus8723BSdio (struct adapter *adapter) {
@@ -1109,8 +1109,8 @@ u8 HalQueryTxBufferStatus8723BSdio(struct adapter *adapter) }/* */ -/* Description: */ -/* Query SDIO Local register to get the current number of TX OQT Free Space. */ +/* Description: */ +/* Query SDIO Local register to get the current number of TX OQT Free Space. */ /* */ void HalQueryTxOQTBufferStatus8723BSdio (struct adapter *adapter) {
Signature · 1 line
2.20.1
PATCH 4/4 staging: rtl8723bs: Fix style in definitions
In reply to Javier F. AriasFix the style in definitions where commented code was previously removed for an improved code readability.
--- drivers/staging/rtl8723bs/hal/sdio_ops.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_ops.c +4 -6
@@ -738,10 +738,9 @@ void InitInterrupt8723BSdio(struct adapter *adapter)struct hal_com_data *haldata; haldata =GET_HAL_DATA (adapter); - haldata->sdio_himr = (u32)( \ -SDIO_HIMR_RX_REQUEST_MSK | -SDIO_HIMR_AVAL_MSK | -0 ); + haldata->sdio_himr = (u32)(SDIO_HIMR_RX_REQUEST_MSK | +SDIO_HIMR_AVAL_MSK | +0 ); }/* */
@@ -756,8 +755,7 @@ void InitSysInterrupt8723BSdio(struct adapter *adapter) haldata =GET_HAL_DATA (adapter); - haldata->SysIntrMask = ( \ -0 ); + haldata->SysIntrMask = (0 ); }/* */
Signature · 1 line
2.20.1