staging: rtl8723bs: Resolve checkpatch error "that open brace { should be on the previous line" in the rtl8723bs driver
PATCH 1/1 staging: rtl8723bs: Resolve checkpatch error "that open brace { should be on the previous line" in the rtl8723bs driver
Cleaned up the code from the following files to get rid of check patch error "that open brace { should be on the previous line"
drivers/staging/rtl8723bs/os_dep/mlme_linux.cdrivers/staging/rtl8723bs/os_dep/recv_linux.cdrivers/staging/rtl8723bs/os_dep/rtw_proc.cdrivers/staging/rtl8723bs/os_dep/sdio_intf.cdrivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
--- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 14 ++--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 76 ++++++++--------------- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 6 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 15 ++--- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 +++---- 5 files changed, 47 insertions(+), 88 deletions(-)
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +6 -8
@@ -46,8 +46,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) - { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); }else
@@ -77,8 +76,8 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802.1x */ - { +if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {/* 802.1x */ +/* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */ /* */
@@ -106,8 +105,8 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; } -else /* reset values in securitypriv */ - { +else {/* reset values in securitypriv */ +/* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ /* */ struct security_priv *psec_priv = &adapter->securitypriv;
@@ -150,8 +149,7 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("+rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =NULL ; -if (authmode == _WPA_IE_ID_) - { +if (authmode == _WPA_IE_ID_) {RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =rtw_zmalloc (IW_CUSTOM_MAX );
drivers/staging/rtl8723bs/os_dep/recv_linux.c +26 -50
186 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/rtw_proc.c +2 -4
@@ -63,8 +63,7 @@ static ssize_t proc_set_log_level(struct file *file, const char __user *buffer,if (buffer && !copy_from_user (tmp, buffer,sizeof (tmp))) {sscanf (tmp,"%d " , &log_level); -if (log_level >= _drv_always_ && log_level <= _drv_debug_) - { +if (log_level >= _drv_always_ && log_level <= _drv_debug_) { GlobalDebugLevel = log_level;printk ("%d\n" , GlobalDebugLevel); }
@@ -224,8 +223,7 @@ static ssize_t proc_set_linked_info_dump(struct file *file, const char __user *breturn -EFAULT ;if (buffer && !copy_from_user (tmp, buffer,sizeof (tmp))) { -if (padapter) - { +if (padapter) {/* padapter->bLinkInfoDump = mode; */ /* DBG_871X("linked_info_dump =%s\n", (padapter->bLinkInfoDump)?"enable":"disable"); */ linked_info_dump (padapter, mode);
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +5 -10
@@ -85,13 +85,11 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)sdio_claim_host (func); err =sdio_claim_irq (func, &sd_sync_int_hdl); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++;printk (KERN_CRIT "%s: sdio_claim_irq FAIL(%d)!\n" , __func__, err); } -else - { +else { dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++; dvobj->irq_alloc =1 ; }
@@ -114,8 +112,7 @@ static void sdio_free_irq(struct dvobj_priv *dvobj)if (func) {sdio_claim_host (func); err =sdio_release_irq (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_871X_LEVEL (_drv_err_,"%s: sdio_release_irq FAIL(%d)!\n" , __func__, err); }
@@ -225,16 +222,14 @@ static void sdio_deinit(struct dvobj_priv *dvobj)if (func) {sdio_claim_host (func); err =sdio_disable_func (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_deinit_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_disable_func(%d)\n" , __func__, err); }if (dvobj->irq_alloc) { err =sdio_release_irq (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_release_irq(%d)\n" , __func__, err); }
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +8 -16
@@ -257,15 +257,13 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err)if (claim_needed)sdio_release_host (func); -if (err && *err) - { +if (err && *err) {int i;DBG_871X (KERN_ERR "%s: (%d) addr = 0x%05x, val = 0x%x\n" , __func__, *err, addr, v); *err =0 ; -for (i =0 ; i <SD_IO_TRY_CNT ; i++) - { +for (i =0 ; i <SD_IO_TRY_CNT ; i++) {if (claim_needed)sdio_claim_host (func); v =sdio_readl (func, addr, err);if (claim_needed)sdio_release_host (func);
@@ -350,15 +348,13 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err)if (claim_needed)sdio_release_host (func); -if (err && *err) - { +if (err && *err) {int i;DBG_871X (KERN_ERR "%s: (%d) addr = 0x%05x val = 0x%08x\n" , __func__, *err, addr, v); *err =0 ; -for (i =0 ; i <SD_IO_TRY_CNT ; i++) - { +for (i =0 ; i <SD_IO_TRY_CNT ; i++) {if (claim_needed)sdio_claim_host (func);sdio_writel (func, v, addr, err);if (claim_needed)sdio_release_host (func);
@@ -420,13 +416,11 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) func = psdio->func; -if (unlikely ((cnt ==1 ) || (cnt ==2 ))) - { +if (unlikely ((cnt ==1 ) || (cnt ==2 ))) {int i;u8 *pbuf = pdata; -for (i =0 ; i < cnt; i++) - { +for (i =0 ; i < cnt; i++) { *(pbuf+i) =sdio_readb (func, addr+i, &err);if (err) {
@@ -523,13 +517,11 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) func = psdio->func;/* size = sdio_align_size(func, cnt); */ -if (unlikely ((cnt ==1 ) || (cnt ==2 ))) - { +if (unlikely ((cnt ==1 ) || (cnt ==2 ))) {int i;u8 *pbuf = pdata; -for (i =0 ; i < cnt; i++) - { +for (i =0 ; i < cnt; i++) {sdio_writeb (func, *(pbuf+i), addr+i, &err);if (err) {DBG_871X (KERN_ERR "%s: FAIL!(%d) addr = 0x%05x val = 0x%02x\n" , __func__, err, addr, *(pbuf+i));
Signature · 1 line
2.7.4
Greg Kroah-Hartman
maintainerQuoted 44 lines · Shobhit Kukreti
Cleaned up the code from the following files to get rid of check patch error "that open brace { should be on the previous line"
drivers/staging/rtl8723bs/os_dep/mlme_linux.cdrivers/staging/rtl8723bs/os_dep/recv_linux.cdrivers/staging/rtl8723bs/os_dep/rtw_proc.cdrivers/staging/rtl8723bs/os_dep/sdio_intf.cdrivers/staging/rtl8723bs/os_dep/sdio_ops_linux.cSigned-off-by Shobhit Kukreti <[email protected]>--- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 14 ++--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 76 ++++++++--------------- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 6 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 15 ++--- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 +++---- 5 files changed, 47 insertions(+), 88 deletions(-)drivers/staging/rtl8723bs/os_dep/mlme_linux.c +3
-4@@ -46,8 +46,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) - { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); }else @@ -77,8 +76,8 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802.1x */ - { +if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {/* 802.1x */ +/* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */ /* */
drivers/staging/rtl8723bs/os_dep/mlme_linux.c void rtw_reset_securitypriv(struct adapter *adapter) · line 109
Quoted 7 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +2
-2@@ -106,8 +105,8 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; } -else /* reset values in securitypriv */ - { +else {/* reset values in securitypriv */ +
Trailing whitespace?
The comment should be on a new line, not on the same line.
thanks,
greg k-h
PATCH v2 1/1 staging: rtl8723bs: Resolve checkpatch error "that open brace { should be on the previous line" in the rtl8723 driver
Cleaned up the code from the following files to get rid of check patch error "that open brace { should be on the previous line"
drivers/staging/rtl8723bs/os_dep/mlme_linux.cdrivers/staging/rtl8723bs/os_dep/recv_linux.cdrivers/staging/rtl8723bs/os_dep/rtw_proc.cdrivers/staging/rtl8723bs/os_dep/sdio_intf.cdrivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
---
Changes in v2:
- Removed Trailing whitespace introduced in the previous patch
- Moved comments to a new line
drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 15 +++-- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 77 ++++++++--------------- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 6 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 15 ++--- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 +++---- 5 files changed, 49 insertions(+), 88 deletions(-)
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +7 -8
@@ -46,8 +46,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) - { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); }else
@@ -77,8 +76,8 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802.1x */ - { +if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {/* 802.1x */ +/* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */ /* */
@@ -106,8 +105,9 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; } -else /* reset values in securitypriv */ - { +else { +/* reset values in securitypriv */ +/* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ /* */ struct security_priv *psec_priv = &adapter->securitypriv;
@@ -150,8 +150,7 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("+rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =NULL ; -if (authmode == _WPA_IE_ID_) - { +if (authmode == _WPA_IE_ID_) {RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =rtw_zmalloc (IW_CUSTOM_MAX );
drivers/staging/rtl8723bs/os_dep/recv_linux.c +27 -50
187 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/rtw_proc.c +2 -4
@@ -63,8 +63,7 @@ static ssize_t proc_set_log_level(struct file *file, const char __user *buffer,if (buffer && !copy_from_user (tmp, buffer,sizeof (tmp))) {sscanf (tmp,"%d " , &log_level); -if (log_level >= _drv_always_ && log_level <= _drv_debug_) - { +if (log_level >= _drv_always_ && log_level <= _drv_debug_) { GlobalDebugLevel = log_level;printk ("%d\n" , GlobalDebugLevel); }
@@ -224,8 +223,7 @@ static ssize_t proc_set_linked_info_dump(struct file *file, const char __user *breturn -EFAULT ;if (buffer && !copy_from_user (tmp, buffer,sizeof (tmp))) { -if (padapter) - { +if (padapter) {/* padapter->bLinkInfoDump = mode; */ /* DBG_871X("linked_info_dump =%s\n", (padapter->bLinkInfoDump)?"enable":"disable"); */ linked_info_dump (padapter, mode);
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +5 -10
@@ -85,13 +85,11 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)sdio_claim_host (func); err =sdio_claim_irq (func, &sd_sync_int_hdl); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++;printk (KERN_CRIT "%s: sdio_claim_irq FAIL(%d)!\n" , __func__, err); } -else - { +else { dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++; dvobj->irq_alloc =1 ; }
@@ -114,8 +112,7 @@ static void sdio_free_irq(struct dvobj_priv *dvobj)if (func) {sdio_claim_host (func); err =sdio_release_irq (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_871X_LEVEL (_drv_err_,"%s: sdio_release_irq FAIL(%d)!\n" , __func__, err); }
@@ -225,16 +222,14 @@ static void sdio_deinit(struct dvobj_priv *dvobj)if (func) {sdio_claim_host (func); err =sdio_disable_func (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_deinit_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_disable_func(%d)\n" , __func__, err); }if (dvobj->irq_alloc) { err =sdio_release_irq (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_release_irq(%d)\n" , __func__, err); }
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +8 -16
@@ -257,15 +257,13 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err)if (claim_needed)sdio_release_host (func); -if (err && *err) - { +if (err && *err) {int i;DBG_871X (KERN_ERR "%s: (%d) addr = 0x%05x, val = 0x%x\n" , __func__, *err, addr, v); *err =0 ; -for (i =0 ; i <SD_IO_TRY_CNT ; i++) - { +for (i =0 ; i <SD_IO_TRY_CNT ; i++) {if (claim_needed)sdio_claim_host (func); v =sdio_readl (func, addr, err);if (claim_needed)sdio_release_host (func);
@@ -350,15 +348,13 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err)if (claim_needed)sdio_release_host (func); -if (err && *err) - { +if (err && *err) {int i;DBG_871X (KERN_ERR "%s: (%d) addr = 0x%05x val = 0x%08x\n" , __func__, *err, addr, v); *err =0 ; -for (i =0 ; i <SD_IO_TRY_CNT ; i++) - { +for (i =0 ; i <SD_IO_TRY_CNT ; i++) {if (claim_needed)sdio_claim_host (func);sdio_writel (func, v, addr, err);if (claim_needed)sdio_release_host (func);
@@ -420,13 +416,11 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) func = psdio->func; -if (unlikely ((cnt ==1 ) || (cnt ==2 ))) - { +if (unlikely ((cnt ==1 ) || (cnt ==2 ))) {int i;u8 *pbuf = pdata; -for (i =0 ; i < cnt; i++) - { +for (i =0 ; i < cnt; i++) { *(pbuf+i) =sdio_readb (func, addr+i, &err);if (err) {
@@ -523,13 +517,11 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) func = psdio->func;/* size = sdio_align_size(func, cnt); */ -if (unlikely ((cnt ==1 ) || (cnt ==2 ))) - { +if (unlikely ((cnt ==1 ) || (cnt ==2 ))) {int i;u8 *pbuf = pdata; -for (i =0 ; i < cnt; i++) - { +for (i =0 ; i < cnt; i++) {sdio_writeb (func, *(pbuf+i), addr+i, &err);if (err) {DBG_871X (KERN_ERR "%s: FAIL!(%d) addr = 0x%05x val = 0x%02x\n" , __func__, err, addr, *(pbuf+i));
Signature · 1 line
2.7.4
Re: [PATCH v2] staging: rtl8723bs: Resolve checkpatch error "that open brace { should be on the previous line" in the rtl8723 driver
Quoted 2 lines · Shobhit Kukreti
Cleaned up the code from the following files to get rid of check patch error "that open brace { should be on the previous line"
It's fine you are modifying brace styles, but:
Quoted 5 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +0
-0
drivers/staging/rtl8723bs/os_dep/mlme_linux.c void rtw_os_indicate_connect(struct adapter *adapter) · line 52
Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +1
-2@@ -46,8 +46,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) - { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); }else
the else should be on the same line as the close brace
drivers/staging/rtl8723bs/os_dep/mlme_linux.c void rtw_reset_securitypriv(struct adapter *adapter) · line 110
Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +3
-2@@ -106,8 +105,9 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; } -else /* reset values in securitypriv */ - { +else { +/* reset values in securitypriv */ +
and here. etc. Please change all instances appropriately.
Re: [PATCH v2] staging: rtl8723bs: Resolve checkpatch error "that open brace { should be on the previous line" in the rtl8723 driver
Quoted 26 lines · Joe Perches
Quoted 2 lines · Shobhit Kukreti
Cleaned up the code from the following files to get rid of check patch error "that open brace { should be on the previous line"
It's fine you are modifying brace styles, but:
Quoted 5 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +0
-0drivers/staging/rtl8723bs/os_dep/mlme_linux.c void rtw_os_indicate_connect(struct adapter *adapter) · line 52
Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +1
-2@@ -46,8 +46,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) - { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); }else the else should be on the same line as the close brace
Quoted 3 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +0
-0@@ -106,8 +105,9 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
Quoted 8 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c void rtw_reset_securitypriv(struct adapter *adapter) · line 110
Quoted 6 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +3
-2} -else /* reset values in securitypriv */ - { +else { +/* reset values in securitypriv */ +and here. etc. Please change all instances appropriately.
Thank you for the feedback. I intented to do one kind of change in a patch. This probably would need a patch set. Will edit appropriately.
Best,
Shobhit Kukreti
Quoted 2 lines
v3 cover Resolve checkpatch if/else brace style errors
This patchset fixes the following errors reported by checkpatch in the staging/rtl8723bs driver.
Patch[1/3]: Fix check patch error "that open brace { should be on the previous line"
Patch[2/3]: Fix the error else should follow close brace '}'
Patch[3/3]: Fix Indentation Error
version 3 changes:
- Converted the patch to a patchset
- Resolve checkpatch errors:
else should follow close brace '}' Fixed Indentation Error to use tabs
- Compiles and builds, untested on real hardware.
version 2 changes:
- Removed Trailing whitespace introduced in the previous patch
- Moved comments to a new line in the else statement
Shobhit Kukreti (3):
staging: rtl8723bs: Resolve checkpatch error "that open brace { should
be on the previous line" in the rtl8723 driver
staging: rtl8723bs: Resolve the checkpatch error: else should follow
close brace '}'
staging: rtl8723bs: Fix Indentation Error: code indent should use tabs
where possible
drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 19 ++--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 90 ++++++++--------------- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 6 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 54 ++++++-------- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 ++---- 5 files changed, 71 insertions(+), 122 deletions(-)
Signature · 1 line
2.7.4
PATCH v3 1/3 staging: rtl8723bs: Resolve checkpatch error "that open brace { should be on the previous line" in the rtl8723 driver
Cleaned up the code from the following files to get rid of check patch error "that open brace { should be on the previous line"
drivers/staging/rtl8723bs/os_dep/mlme_linux.cdrivers/staging/rtl8723bs/os_dep/recv_linux.cdrivers/staging/rtl8723bs/os_dep/rtw_proc.cdrivers/staging/rtl8723bs/os_dep/sdio_intf.cdrivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
--- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 15 +++-- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 77 ++++++++--------------- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 6 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 15 ++--- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 +++---- 5 files changed, 49 insertions(+), 88 deletions(-)
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +7 -8
@@ -46,8 +46,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) - { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); }else
@@ -77,8 +76,8 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802.1x */ - { +if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {/* 802.1x */ +/* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */ /* */
@@ -106,8 +105,9 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; } -else /* reset values in securitypriv */ - { +else { +/* reset values in securitypriv */ +/* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ /* */ struct security_priv *psec_priv = &adapter->securitypriv;
@@ -150,8 +150,7 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("+rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =NULL ; -if (authmode == _WPA_IE_ID_) - { +if (authmode == _WPA_IE_ID_) {RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =rtw_zmalloc (IW_CUSTOM_MAX );
drivers/staging/rtl8723bs/os_dep/recv_linux.c +27 -50
187 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/rtw_proc.c +2 -4
@@ -63,8 +63,7 @@ static ssize_t proc_set_log_level(struct file *file, const char __user *buffer,if (buffer && !copy_from_user (tmp, buffer,sizeof (tmp))) {sscanf (tmp,"%d " , &log_level); -if (log_level >= _drv_always_ && log_level <= _drv_debug_) - { +if (log_level >= _drv_always_ && log_level <= _drv_debug_) { GlobalDebugLevel = log_level;printk ("%d\n" , GlobalDebugLevel); }
@@ -224,8 +223,7 @@ static ssize_t proc_set_linked_info_dump(struct file *file, const char __user *breturn -EFAULT ;if (buffer && !copy_from_user (tmp, buffer,sizeof (tmp))) { -if (padapter) - { +if (padapter) {/* padapter->bLinkInfoDump = mode; */ /* DBG_871X("linked_info_dump =%s\n", (padapter->bLinkInfoDump)?"enable":"disable"); */ linked_info_dump (padapter, mode);
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +5 -10
@@ -85,13 +85,11 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)sdio_claim_host (func); err =sdio_claim_irq (func, &sd_sync_int_hdl); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++;printk (KERN_CRIT "%s: sdio_claim_irq FAIL(%d)!\n" , __func__, err); } -else - { +else { dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++; dvobj->irq_alloc =1 ; }
@@ -114,8 +112,7 @@ static void sdio_free_irq(struct dvobj_priv *dvobj)if (func) {sdio_claim_host (func); err =sdio_release_irq (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_871X_LEVEL (_drv_err_,"%s: sdio_release_irq FAIL(%d)!\n" , __func__, err); }
@@ -225,16 +222,14 @@ static void sdio_deinit(struct dvobj_priv *dvobj)if (func) {sdio_claim_host (func); err =sdio_disable_func (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_deinit_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_disable_func(%d)\n" , __func__, err); }if (dvobj->irq_alloc) { err =sdio_release_irq (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_release_irq(%d)\n" , __func__, err); }
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +8 -16
@@ -257,15 +257,13 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err)if (claim_needed)sdio_release_host (func); -if (err && *err) - { +if (err && *err) {int i;DBG_871X (KERN_ERR "%s: (%d) addr = 0x%05x, val = 0x%x\n" , __func__, *err, addr, v); *err =0 ; -for (i =0 ; i <SD_IO_TRY_CNT ; i++) - { +for (i =0 ; i <SD_IO_TRY_CNT ; i++) {if (claim_needed)sdio_claim_host (func); v =sdio_readl (func, addr, err);if (claim_needed)sdio_release_host (func);
@@ -350,15 +348,13 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err)if (claim_needed)sdio_release_host (func); -if (err && *err) - { +if (err && *err) {int i;DBG_871X (KERN_ERR "%s: (%d) addr = 0x%05x val = 0x%08x\n" , __func__, *err, addr, v); *err =0 ; -for (i =0 ; i <SD_IO_TRY_CNT ; i++) - { +for (i =0 ; i <SD_IO_TRY_CNT ; i++) {if (claim_needed)sdio_claim_host (func);sdio_writel (func, v, addr, err);if (claim_needed)sdio_release_host (func);
@@ -420,13 +416,11 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) func = psdio->func; -if (unlikely ((cnt ==1 ) || (cnt ==2 ))) - { +if (unlikely ((cnt ==1 ) || (cnt ==2 ))) {int i;u8 *pbuf = pdata; -for (i =0 ; i < cnt; i++) - { +for (i =0 ; i < cnt; i++) { *(pbuf+i) =sdio_readb (func, addr+i, &err);if (err) {
@@ -523,13 +517,11 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) func = psdio->func;/* size = sdio_align_size(func, cnt); */ -if (unlikely ((cnt ==1 ) || (cnt ==2 ))) - { +if (unlikely ((cnt ==1 ) || (cnt ==2 ))) {int i;u8 *pbuf = pdata; -for (i =0 ; i < cnt; i++) - { +for (i =0 ; i < cnt; i++) {sdio_writeb (func, *(pbuf+i), addr+i, &err);if (err) {DBG_871X (KERN_ERR "%s: FAIL!(%d) addr = 0x%05x val = 0x%02x\n" , __func__, err, addr, *(pbuf+i));
Signature · 1 line
2.7.4
Greg Kroah-Hartman
maintainerRe: [PATCH v3 1/3] staging: rtl8723bs: Resolve checkpatch error "that open brace { should be on the previous line" in the rtl8723 driver
Quoted 33 lines · Shobhit Kukreti
Cleaned up the code from the following files to get rid of check patch error "that open brace { should be on the previous line"
drivers/staging/rtl8723bs/os_dep/mlme_linux.cdrivers/staging/rtl8723bs/os_dep/recv_linux.cdrivers/staging/rtl8723bs/os_dep/rtw_proc.cdrivers/staging/rtl8723bs/os_dep/sdio_intf.cdrivers/staging/rtl8723bs/os_dep/sdio_ops_linux.cSigned-off-by Shobhit Kukreti <[email protected]>--- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 15 +++-- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 77 ++++++++--------------- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 6 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 15 ++--- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 +++---- 5 files changed, 49 insertions(+), 88 deletions(-)drivers/staging/rtl8723bs/os_dep/mlme_linux.c +1
-2@@ -46,8 +46,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) - { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); }else
drivers/staging/rtl8723bs/os_dep/mlme_linux.c void rtw_reset_securitypriv(struct adapter *adapter) · line 80
Quoted 7 lines
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +2
-2@@ -77,8 +76,8 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802.1x */ - { +if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {/* 802.1x */ +
Why the blank line?
And don't keep the comment on the right side, that's just a pain to work with.
thanks,
greg k-h
v4 cover Resolve if/else brace-style errors
This patchset fixes the following errors reported by checkpatch in the staging/rtl8723bs driver.
Patch[1/3]: Fix check patch error "that open brace { should be on the previous line"
Patch[2/3]: Fix the error else should follow close brace '}'
Patch[3/3]: Fix Indentation Error
The patch should be applied in the sequence of 1-3. Each patch performs one clean up operation.
version 4 changes:
- Moved comments to a new line
- Removed an extra blank line
version 3 changes:
- Converted the patch to a patchset
- Resolve checkpatch errors:
else should follow close brace '}' Fixed Indentation Error to use tabs
- Compiles and builds, untested on real hardware.
version 2 changes:
- Removed Trailing whitespace introduced in the previous patch
- Moved comments to a new line in the else statement
Shobhit Kukreti (3):
staging: rtl8723bs: Resolve checkpatch error "that open brace { should
be on the previous line" in the rtl8723 driver
staging: rtl8723bs: Resolve the checkpatch error: else should follow
close brace '}'
staging: rtl8723bs: Fix Indentation Error: code indent should use tabs
where possible
drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 18 ++--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 89 ++++++++--------------- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 6 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 54 ++++++-------- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 ++---- 5 files changed, 69 insertions(+), 122 deletions(-)
Signature · 1 line
2.7.4
PATCH v4 1/3 staging: rtl8723bs: Resolve checkpatch error "that open brace { should be on the previous line" in the rtl8723 driver
Cleaned up the code from the following files to get rid of check patch error "that open brace { should be on the previous line"
drivers/staging/rtl8723bs/os_dep/mlme_linux.cdrivers/staging/rtl8723bs/os_dep/recv_linux.cdrivers/staging/rtl8723bs/os_dep/rtw_proc.cdrivers/staging/rtl8723bs/os_dep/sdio_intf.cdrivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
--- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 14 ++--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 76 ++++++++--------------- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 6 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 15 ++--- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 +++---- 5 files changed, 47 insertions(+), 88 deletions(-)
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +6 -8
@@ -46,8 +46,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) - { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); }else
@@ -77,8 +76,8 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802.1x */ - { +if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { +/* 802.1x */ /* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */ /* */
@@ -106,8 +105,8 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; } -else /* reset values in securitypriv */ - { +else { +/* reset values in securitypriv */ /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ /* */ struct security_priv *psec_priv = &adapter->securitypriv;
@@ -150,8 +149,7 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("+rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =NULL ; -if (authmode == _WPA_IE_ID_) - { +if (authmode == _WPA_IE_ID_) {RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =rtw_zmalloc (IW_CUSTOM_MAX );
drivers/staging/rtl8723bs/os_dep/recv_linux.c +26 -50
186 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/rtw_proc.c +2 -4
@@ -63,8 +63,7 @@ static ssize_t proc_set_log_level(struct file *file, const char __user *buffer,if (buffer && !copy_from_user (tmp, buffer,sizeof (tmp))) {sscanf (tmp,"%d " , &log_level); -if (log_level >= _drv_always_ && log_level <= _drv_debug_) - { +if (log_level >= _drv_always_ && log_level <= _drv_debug_) { GlobalDebugLevel = log_level;printk ("%d\n" , GlobalDebugLevel); }
@@ -224,8 +223,7 @@ static ssize_t proc_set_linked_info_dump(struct file *file, const char __user *breturn -EFAULT ;if (buffer && !copy_from_user (tmp, buffer,sizeof (tmp))) { -if (padapter) - { +if (padapter) {/* padapter->bLinkInfoDump = mode; */ /* DBG_871X("linked_info_dump =%s\n", (padapter->bLinkInfoDump)?"enable":"disable"); */ linked_info_dump (padapter, mode);
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +5 -10
@@ -85,13 +85,11 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)sdio_claim_host (func); err =sdio_claim_irq (func, &sd_sync_int_hdl); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++;printk (KERN_CRIT "%s: sdio_claim_irq FAIL(%d)!\n" , __func__, err); } -else - { +else { dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++; dvobj->irq_alloc =1 ; }
@@ -114,8 +112,7 @@ static void sdio_free_irq(struct dvobj_priv *dvobj)if (func) {sdio_claim_host (func); err =sdio_release_irq (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_871X_LEVEL (_drv_err_,"%s: sdio_release_irq FAIL(%d)!\n" , __func__, err); }
@@ -225,16 +222,14 @@ static void sdio_deinit(struct dvobj_priv *dvobj)if (func) {sdio_claim_host (func); err =sdio_disable_func (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_deinit_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_disable_func(%d)\n" , __func__, err); }if (dvobj->irq_alloc) { err =sdio_release_irq (func); -if (err) - { +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_release_irq(%d)\n" , __func__, err); }
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +8 -16
@@ -257,15 +257,13 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err)if (claim_needed)sdio_release_host (func); -if (err && *err) - { +if (err && *err) {int i;DBG_871X (KERN_ERR "%s: (%d) addr = 0x%05x, val = 0x%x\n" , __func__, *err, addr, v); *err =0 ; -for (i =0 ; i <SD_IO_TRY_CNT ; i++) - { +for (i =0 ; i <SD_IO_TRY_CNT ; i++) {if (claim_needed)sdio_claim_host (func); v =sdio_readl (func, addr, err);if (claim_needed)sdio_release_host (func);
@@ -350,15 +348,13 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err)if (claim_needed)sdio_release_host (func); -if (err && *err) - { +if (err && *err) {int i;DBG_871X (KERN_ERR "%s: (%d) addr = 0x%05x val = 0x%08x\n" , __func__, *err, addr, v); *err =0 ; -for (i =0 ; i <SD_IO_TRY_CNT ; i++) - { +for (i =0 ; i <SD_IO_TRY_CNT ; i++) {if (claim_needed)sdio_claim_host (func);sdio_writel (func, v, addr, err);if (claim_needed)sdio_release_host (func);
@@ -420,13 +416,11 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) func = psdio->func; -if (unlikely ((cnt ==1 ) || (cnt ==2 ))) - { +if (unlikely ((cnt ==1 ) || (cnt ==2 ))) {int i;u8 *pbuf = pdata; -for (i =0 ; i < cnt; i++) - { +for (i =0 ; i < cnt; i++) { *(pbuf+i) =sdio_readb (func, addr+i, &err);if (err) {
@@ -523,13 +517,11 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) func = psdio->func;/* size = sdio_align_size(func, cnt); */ -if (unlikely ((cnt ==1 ) || (cnt ==2 ))) - { +if (unlikely ((cnt ==1 ) || (cnt ==2 ))) {int i;u8 *pbuf = pdata; -for (i =0 ; i < cnt; i++) - { +for (i =0 ; i < cnt; i++) {sdio_writeb (func, *(pbuf+i), addr+i, &err);if (err) {DBG_871X (KERN_ERR "%s: FAIL!(%d) addr = 0x%05x val = 0x%02x\n" , __func__, err, addr, *(pbuf+i));
Signature · 1 line
2.7.4
PATCH v4 2/3 staging: rtl8723bs: Resolve the checkpatch error: else should follow close brace '}'
In reply to Shobhit KukretiCleaned up the code to resolve the checkpatch error else should follow close brace '}' from the following files:
mlme_linux.crecv_linux.csdio_intf.c
--- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 6 ++---- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 21 +++++++-------------- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 9 +++------ 3 files changed, 12 insertions(+), 24 deletions(-)
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +2 -4
@@ -48,8 +48,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); - } -else + }else rtw_cfg80211_indicate_connect (adapter);rtw_indicate_wx_assoc_event (adapter);
@@ -104,8 +103,7 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; - } -else { + }else {/* reset values in securitypriv */ /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ /* */
drivers/staging/rtl8723bs/os_dep/recv_linux.c +7 -14
@@ -62,15 +62,13 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8if (sub_skb) {skb_reserve (sub_skb,12 );skb_put_data (sub_skb, (pdata +ETH_HLEN ), nSubframe_Length); - } -else { + }else { sub_skb =rtw_skb_clone (prframe->u.hdr.pkt);if (sub_skb) { sub_skb->data = pdata +ETH_HLEN ; sub_skb->len = nSubframe_Length;skb_set_tail_pointer (sub_skb, nSubframe_Length); - } -else { + }else {DBG_871X ("%s(): rtw_skb_clone() Fail!!!\n" , __func__);return NULL ; }
@@ -142,8 +140,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pktreturn ; } } - } -else { + }else {/* to APself */ /* DBG_871X("to APSelf\n"); */ DBG_COUNTER (padapter->rx_logs.os_indicate_ap_self);
@@ -182,24 +179,21 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)if (psecuritypriv->last_mic_err_time ==0 ) { psecuritypriv->last_mic_err_time = jiffies; - } -else { + }else { cur_time = jiffies;if (cur_time - psecuritypriv->last_mic_err_time <60 *HZ ) { psecuritypriv->btkip_countermeasure = true; psecuritypriv->last_mic_err_time =0 ; psecuritypriv->btkip_countermeasure_time = cur_time; - } -else { + }else { psecuritypriv->last_mic_err_time = jiffies; } }if (bgroup) { key_type |=NL80211_KEYTYPE_GROUP ; - } -else { + }else { key_type |=NL80211_KEYTYPE_PAIRWISE ; }
@@ -209,8 +203,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)memset (&ev,0x00 ,sizeof (ev));if (bgroup) { ev.flags |=IW_MICFAILURE_GROUP ; - } -else { + }else { ev.flags |=IW_MICFAILURE_PAIRWISE ; }
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +3 -6
@@ -88,8 +88,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)if (err) { dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++;printk (KERN_CRIT "%s: sdio_claim_irq FAIL(%d)!\n" , __func__, err); - } -else { + }else { dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++; dvobj->irq_alloc =1 ; }
@@ -115,8 +114,7 @@ static void sdio_free_irq(struct dvobj_priv *dvobj)if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_871X_LEVEL (_drv_err_,"%s: sdio_release_irq FAIL(%d)!\n" , __func__, err); - } -else + }else dvobj->drv_dbg.dbg_sdio_free_irq_cnt++;sdio_release_host (func); }
@@ -232,8 +230,7 @@ static void sdio_deinit(struct dvobj_priv *dvobj)if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_release_irq(%d)\n" , __func__, err); - } -else + }else dvobj->drv_dbg.dbg_sdio_free_irq_cnt++; }
Signature · 1 line
2.7.4
PATCH v4 3/3 staging: rtl8723bs: Fix Indentation Error: code indent should use tabs where possible
In reply to Shobhit KukretiResolve indentation errors which were caused by a mix of space and tabs for indentation. Previous patch to fix if-else brace styles revealed the indentation error
--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 6 ++--- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 36 +++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +3 -3
@@ -202,9 +202,9 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)memset (&ev,0x00 ,sizeof (ev));if (bgroup) { - ev.flags |=IW_MICFAILURE_GROUP ; + ev.flags |=IW_MICFAILURE_GROUP ; }else { - ev.flags |=IW_MICFAILURE_PAIRWISE ; + ev.flags |=IW_MICFAILURE_PAIRWISE ; } ev.src_addr.sa_family =ARPHRD_ETHER ;
@@ -297,7 +297,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frameRT_TRACE (_module_recv_osdep_c_, _drv_info_, ("\n rtw_recv_indicatepkt :after rtw_os_recv_indicate_pkt!!!!\n" )); -return _SUCCESS; +return _SUCCESS; _recv_indicatepkt_drop:
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +18 -18
@@ -100,26 +100,26 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)static void sdio_free_irq (struct dvobj_priv *dvobj) { -struct sdio_data *psdio_data; -struct sdio_func *func; -int err; - -if (dvobj->irq_alloc) { - psdio_data = &dvobj->intf_data; - func = psdio_data->func; - -if (func) { -sdio_claim_host (func); - err =sdio_release_irq (func); -if (err) { +struct sdio_data *psdio_data; +struct sdio_func *func; +int err; + +if (dvobj->irq_alloc) { + psdio_data = &dvobj->intf_data; + func = psdio_data->func; + +if (func) { +sdio_claim_host (func); + err =sdio_release_irq (func); +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_871X_LEVEL (_drv_err_,"%s: sdio_release_irq FAIL(%d)!\n" , __func__, err); - }else - dvobj->drv_dbg.dbg_sdio_free_irq_cnt++; -sdio_release_host (func); - } - dvobj->irq_alloc =0 ; - } + }else + dvobj->drv_dbg.dbg_sdio_free_irq_cnt++; +sdio_release_host (func); + } + dvobj->irq_alloc =0 ; + } }#ifdef CONFIG_GPIO_WAKEUP
Signature · 1 line
2.7.4
PATCH v3 2/3 staging: rtl8723bs: Resolve the checkpatch error: else should follow close brace '}'
In reply to Shobhit KukretiCleaned up the code to resolve the checkpatch error else should follow close brace '}' from the following files:
mlme_linux.crecv_linux.csdio_intf.c
--- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 6 ++---- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 21 +++++++-------------- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 9 +++------ 3 files changed, 12 insertions(+), 24 deletions(-)
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +2 -4
@@ -48,8 +48,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {rtw_cfg80211_ibss_indicate_connect (adapter); - } -else + }else rtw_cfg80211_indicate_connect (adapter);rtw_indicate_wx_assoc_event (adapter);
@@ -104,8 +103,7 @@ void rtw_reset_securitypriv(struct adapter *adapter) adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; - } -else { + }else {/* reset values in securitypriv */ /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */
drivers/staging/rtl8723bs/os_dep/recv_linux.c +7 -14
@@ -62,15 +62,13 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8if (sub_skb) {skb_reserve (sub_skb,12 );skb_put_data (sub_skb, (pdata +ETH_HLEN ), nSubframe_Length); - } -else { + }else { sub_skb =rtw_skb_clone (prframe->u.hdr.pkt);if (sub_skb) { sub_skb->data = pdata +ETH_HLEN ; sub_skb->len = nSubframe_Length;skb_set_tail_pointer (sub_skb, nSubframe_Length); - } -else { + }else {DBG_871X ("%s(): rtw_skb_clone() Fail!!!\n" , __func__);return NULL ; }
@@ -142,8 +140,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pktreturn ; } } - } -else { + }else {/* to APself */ /* DBG_871X("to APSelf\n"); */
@@ -183,24 +180,21 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)if (psecuritypriv->last_mic_err_time ==0 ) { psecuritypriv->last_mic_err_time = jiffies; - } -else { + }else { cur_time = jiffies;if (cur_time - psecuritypriv->last_mic_err_time <60 *HZ ) { psecuritypriv->btkip_countermeasure = true; psecuritypriv->last_mic_err_time =0 ; psecuritypriv->btkip_countermeasure_time = cur_time; - } -else { + }else { psecuritypriv->last_mic_err_time = jiffies; } }if (bgroup) { key_type |=NL80211_KEYTYPE_GROUP ; - } -else { + }else { key_type |=NL80211_KEYTYPE_PAIRWISE ; }
@@ -210,8 +204,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)memset (&ev,0x00 ,sizeof (ev));if (bgroup) { ev.flags |=IW_MICFAILURE_GROUP ; - } -else { + }else { ev.flags |=IW_MICFAILURE_PAIRWISE ; }
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +3 -6
@@ -88,8 +88,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)if (err) { dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++;printk (KERN_CRIT "%s: sdio_claim_irq FAIL(%d)!\n" , __func__, err); - } -else { + }else { dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++; dvobj->irq_alloc =1 ; }
@@ -115,8 +114,7 @@ static void sdio_free_irq(struct dvobj_priv *dvobj)if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_871X_LEVEL (_drv_err_,"%s: sdio_release_irq FAIL(%d)!\n" , __func__, err); - } -else + }else dvobj->drv_dbg.dbg_sdio_free_irq_cnt++;sdio_release_host (func); }
@@ -232,8 +230,7 @@ static void sdio_deinit(struct dvobj_priv *dvobj)if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_8192C (KERN_ERR "%s: sdio_release_irq(%d)\n" , __func__, err); - } -else + }else dvobj->drv_dbg.dbg_sdio_free_irq_cnt++; }
Signature · 1 line
2.7.4
PATCH v3 3/3 staging: rtl8723bs: Fix Indentation Error: code indent should use tabs where possible
In reply to Shobhit KukretiResolve indentation errors which were caused by a mix of space and tabs for indentation. Previous patch to fix if-else brace styles revealed the indentation error
--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 6 ++--- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 36 +++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +3 -3
@@ -203,9 +203,9 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)memset (&ev,0x00 ,sizeof (ev));if (bgroup) { - ev.flags |=IW_MICFAILURE_GROUP ; + ev.flags |=IW_MICFAILURE_GROUP ; }else { - ev.flags |=IW_MICFAILURE_PAIRWISE ; + ev.flags |=IW_MICFAILURE_PAIRWISE ; } ev.src_addr.sa_family =ARPHRD_ETHER ;
@@ -298,7 +298,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frameRT_TRACE (_module_recv_osdep_c_, _drv_info_, ("\n rtw_recv_indicatepkt :after rtw_os_recv_indicate_pkt!!!!\n" )); -return _SUCCESS; +return _SUCCESS; _recv_indicatepkt_drop:
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +18 -18
@@ -100,26 +100,26 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)static void sdio_free_irq (struct dvobj_priv *dvobj) { -struct sdio_data *psdio_data; -struct sdio_func *func; -int err; - -if (dvobj->irq_alloc) { - psdio_data = &dvobj->intf_data; - func = psdio_data->func; - -if (func) { -sdio_claim_host (func); - err =sdio_release_irq (func); -if (err) { +struct sdio_data *psdio_data; +struct sdio_func *func; +int err; + +if (dvobj->irq_alloc) { + psdio_data = &dvobj->intf_data; + func = psdio_data->func; + +if (func) { +sdio_claim_host (func); + err =sdio_release_irq (func); +if (err) { dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;DBG_871X_LEVEL (_drv_err_,"%s: sdio_release_irq FAIL(%d)!\n" , __func__, err); - }else - dvobj->drv_dbg.dbg_sdio_free_irq_cnt++; -sdio_release_host (func); - } - dvobj->irq_alloc =0 ; - } + }else + dvobj->drv_dbg.dbg_sdio_free_irq_cnt++; +sdio_release_host (func); + } + dvobj->irq_alloc =0 ; + } }#ifdef CONFIG_GPIO_WAKEUP
Signature · 1 line
2.7.4