[PATCH] staging: rtl8723bs: Add spaces around '=', '|', '<<'

[PATCH] staging: rtl8723bs: Add spaces around '=', '|', '<<'

[Harsha Sharma]

Use one space around most binary operators

Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 0215899..0129381 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -121,7 +121,7 @@
 
 static int rtw_enusbss = 0;/* 0:disable, 1:enable */
 
-static int rtw_hwpdn_mode =2;/* 0:disable, 1:enable, 2: by EFUSE config */
+static int rtw_hwpdn_mode = 2;/* 0:disable, 1:enable, 2: by EFUSE config */
 
 #ifdef CONFIG_HW_PWRP_DETECTION
 static int rtw_hwpwrp_detect = 1;
@@ -183,7 +183,7 @@
 
 module_param(rtw_hw_wps_pbc, int, 0644);
 
-static uint rtw_max_roaming_times =2;
+static uint rtw_max_roaming_times = 2;
 module_param(rtw_max_roaming_times, uint, 0644);
 MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
 
@@ -222,7 +222,7 @@
 /*  BIT4 - RF,					0: non-support, 1: support */
 /*  BIT5 - RF_TXPWR_TRACK,	0: non-support, 1: support */
 /*  BIT6 - RF_TXPWR_LMT,		0: non-support, 1: support */
-static int rtw_load_phy_file = (BIT2|BIT6);
+static int rtw_load_phy_file = (BIT2 | BIT6);
 module_param(rtw_load_phy_file, int, 0644);
 MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
 static int rtw_decrypt_phy_file = 0;
@@ -255,8 +255,8 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
 
 	registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
 	registry_par->vcs_type = (u8)rtw_vcs_type;
-	registry_par->rts_thresh =(u16)rtw_rts_thresh;
-	registry_par->frag_thresh =(u16)rtw_frag_thresh;
+	registry_par->rts_thresh = (u16)rtw_rts_thresh;
+	registry_par->frag_thresh = (u16)rtw_frag_thresh;
 	registry_par->preamble = (u8)rtw_preamble;
 	registry_par->scan_mode = (u8)rtw_scan_mode;
 	registry_par->adhoc_tx_pwr = (u8)rtw_adhoc_tx_pwr;
@@ -440,7 +440,7 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)
 	u32 priority;
 	u8 *pdata = skb->data;
 
-	memcpy(&eth_type, pdata+(ETH_ALEN<<1), 2);
+	memcpy(&eth_type, pdata+(ETH_ALEN << 1), 2);
 
 	switch (be16_to_cpu(eth_type)) {
 		case ETH_P_IP:
@@ -652,8 +652,8 @@ static u8 rtw_init_default_value(struct adapter *padapter)
 #ifdef CONFIG_GTK_OL
 	psecuritypriv->binstallKCK_KEK = _FAIL;
 #endif /* CONFIG_GTK_OL */
-	psecuritypriv->sw_encrypt =pregistrypriv->software_encrypt;
-	psecuritypriv->sw_decrypt =pregistrypriv->software_decrypt;
+	psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;
+	psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
 
 	psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
 	psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
@@ -748,7 +748,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
 	pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
 	pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
 
-	_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING);
+	_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
 
 	pwrctrlpriv->pwr_state_check_cnts = 0;
 
@@ -777,7 +777,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
 		goto exit;
 	}
 
-	padapter->cmdpriv.padapter =padapter;
+	padapter->cmdpriv.padapter = padapter;
 
 	if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL) {
 		RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init evt_priv\n"));
@@ -986,7 +986,7 @@ int _netdev_open(struct net_device *pnetdev)
 
 		DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr));
 
-		status =rtw_start_drv_threads(padapter);
+		status = rtw_start_drv_threads(padapter);
 		if (status == _FAIL) {
 			DBG_871X("Initialize driver software resource Failed!\n");
 			goto netdev_open_error;
@@ -1641,7 +1641,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
 		}
 
 		/* Disable WOW, set H2C command */
-		poidparam.subcode =WOWLAN_DISABLE;
+		poidparam.subcode = WOWLAN_DISABLE;
 		padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
 
 		psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv));
@@ -1705,7 +1705,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
 		DBG_871X_LEVEL(_drv_always_, "do not reset timer\n");
 	}
 
-	pwrpriv->wowlan_mode =false;
+	pwrpriv->wowlan_mode = false;
 
 	/* clean driver side wake up reason. */
 	pwrpriv->wowlan_wake_reason = 0;
-- 
1.9.1

Re: [Outreachy kernel] [PATCH] staging: rtl8723bs: Add spaces around '=', '|', '<<'

[Julia Lawall]

On Sat, 9 Sep 2017, Harsha Sharma wrote:

> Use one space around most binary operators
>
> Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
> ---
>  drivers/staging/rtl8723bs/os_dep/os_intfs.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index 0215899..0129381 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -121,7 +121,7 @@
>
>  static int rtw_enusbss = 0;/* 0:disable, 1:enable */
>
> -static int rtw_hwpdn_mode =2;/* 0:disable, 1:enable, 2: by EFUSE config */
> +static int rtw_hwpdn_mode = 2;/* 0:disable, 1:enable, 2: by EFUSE config */
>
>  #ifdef CONFIG_HW_PWRP_DETECTION
>  static int rtw_hwpwrp_detect = 1;
> @@ -183,7 +183,7 @@
>
>  module_param(rtw_hw_wps_pbc, int, 0644);
>
> -static uint rtw_max_roaming_times =2;
> +static uint rtw_max_roaming_times = 2;
>  module_param(rtw_max_roaming_times, uint, 0644);
>  MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
>
> @@ -222,7 +222,7 @@
>  /*  BIT4 - RF,					0: non-support, 1: support */
>  /*  BIT5 - RF_TXPWR_TRACK,	0: non-support, 1: support */
>  /*  BIT6 - RF_TXPWR_LMT,		0: non-support, 1: support */
> -static int rtw_load_phy_file = (BIT2|BIT6);
> +static int rtw_load_phy_file = (BIT2 | BIT6);
>  module_param(rtw_load_phy_file, int, 0644);
>  MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
>  static int rtw_decrypt_phy_file = 0;
> @@ -255,8 +255,8 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
>
>  	registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
>  	registry_par->vcs_type = (u8)rtw_vcs_type;
> -	registry_par->rts_thresh =(u16)rtw_rts_thresh;
> -	registry_par->frag_thresh =(u16)rtw_frag_thresh;
> +	registry_par->rts_thresh = (u16)rtw_rts_thresh;
> +	registry_par->frag_thresh = (u16)rtw_frag_thresh;
>  	registry_par->preamble = (u8)rtw_preamble;
>  	registry_par->scan_mode = (u8)rtw_scan_mode;
>  	registry_par->adhoc_tx_pwr = (u8)rtw_adhoc_tx_pwr;
> @@ -440,7 +440,7 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)
>  	u32 priority;
>  	u8 *pdata = skb->data;
>
> -	memcpy(&eth_type, pdata+(ETH_ALEN<<1), 2);
> +	memcpy(&eth_type, pdata+(ETH_ALEN << 1), 2);

The + should have space around it also.

julia

>
>  	switch (be16_to_cpu(eth_type)) {
>  		case ETH_P_IP:
> @@ -652,8 +652,8 @@ static u8 rtw_init_default_value(struct adapter *padapter)
>  #ifdef CONFIG_GTK_OL
>  	psecuritypriv->binstallKCK_KEK = _FAIL;
>  #endif /* CONFIG_GTK_OL */
> -	psecuritypriv->sw_encrypt =pregistrypriv->software_encrypt;
> -	psecuritypriv->sw_decrypt =pregistrypriv->software_decrypt;
> +	psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;
> +	psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
>
>  	psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
>  	psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
> @@ -748,7 +748,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
>  	pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
>  	pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
>
> -	_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING);
> +	_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
>
>  	pwrctrlpriv->pwr_state_check_cnts = 0;
>
> @@ -777,7 +777,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
>  		goto exit;
>  	}
>
> -	padapter->cmdpriv.padapter =padapter;
> +	padapter->cmdpriv.padapter = padapter;
>
>  	if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL) {
>  		RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init evt_priv\n"));
> @@ -986,7 +986,7 @@ int _netdev_open(struct net_device *pnetdev)
>
>  		DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr));
>
> -		status =rtw_start_drv_threads(padapter);
> +		status = rtw_start_drv_threads(padapter);
>  		if (status == _FAIL) {
>  			DBG_871X("Initialize driver software resource Failed!\n");
>  			goto netdev_open_error;
> @@ -1641,7 +1641,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
>  		}
>
>  		/* Disable WOW, set H2C command */
> -		poidparam.subcode =WOWLAN_DISABLE;
> +		poidparam.subcode = WOWLAN_DISABLE;
>  		padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
>
>  		psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv));
> @@ -1705,7 +1705,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
>  		DBG_871X_LEVEL(_drv_always_, "do not reset timer\n");
>  	}
>
> -	pwrpriv->wowlan_mode =false;
> +	pwrpriv->wowlan_mode = false;
>
>  	/* clean driver side wake up reason. */
>  	pwrpriv->wowlan_wake_reason = 0;
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1504981213-14584-1-git-send-email-harshasharmaiitr%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH] staging: rtl8723bs: Add spaces around '=', '|', '<<'

[Julia Lawall]

[-- Attachment #1: Type: text/plain, Size: 7431 bytes --]



On Sun, 10 Sep 2017, Harsha Sharma wrote:

> Hi,Thanks for your feedback.
> I checked patch with checkpatch.pl and thought will add spaces around '+' in
> another patch as there are no. of such warnings.
> Should I add them in this patch only or send another patch for it?

Indeed, I only looked at the commit log, which referred to "most binary
operators".  Actually, I'm not sure that = is considered to be a binary
operator.  If you want to cut things up, perhaps you could do =, and then
do the actual binary operators.

But since they are going to be touching scattered places in the same file,
the patches should be in a series.

julia



>
> Regards,
> Harsha Sharma
>
>
> On Sat, Sep 9, 2017 at 11:56 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>
>
>       On Sat, 9 Sep 2017, Harsha Sharma wrote:
>
>       > Use one space around most binary operators
>       >
>       > Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
>       > ---
>       >  drivers/staging/rtl8723bs/os_dep/os_intfs.c | 26
>       +++++++++++++-------------
>       >  1 file changed, 13 insertions(+), 13 deletions(-)
>       >
>       > diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
>       b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
>       > index 0215899..0129381 100644
>       > --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
>       > +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
>       > @@ -121,7 +121,7 @@
>       >
>       >  static int rtw_enusbss = 0;/* 0:disable, 1:enable */
>       >
>       > -static int rtw_hwpdn_mode =2;/* 0:disable, 1:enable, 2: by
>       EFUSE config */
>       > +static int rtw_hwpdn_mode = 2;/* 0:disable, 1:enable, 2: by
>       EFUSE config */
>       >
>       >  #ifdef CONFIG_HW_PWRP_DETECTION
>       >  static int rtw_hwpwrp_detect = 1;
>       > @@ -183,7 +183,7 @@
>       >
>       >  module_param(rtw_hw_wps_pbc, int, 0644);
>       >
>       > -static uint rtw_max_roaming_times =2;
>       > +static uint rtw_max_roaming_times = 2;
>       >  module_param(rtw_max_roaming_times, uint, 0644);
>       >  MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times
>       to try");
>       >
>       > @@ -222,7 +222,7 @@
>       >  /*  BIT4 - RF,                                       0:
>       non-support, 1: support */
>       >  /*  BIT5 - RF_TXPWR_TRACK,   0: non-support, 1: support */
>       >  /*  BIT6 - RF_TXPWR_LMT,             0: non-support, 1:
>       support */
>       > -static int rtw_load_phy_file = (BIT2|BIT6);
>       > +static int rtw_load_phy_file = (BIT2 | BIT6);
>       >  module_param(rtw_load_phy_file, int, 0644);
>       >  MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
>       >  static int rtw_decrypt_phy_file = 0;
>       > @@ -255,8 +255,8 @@ static uint loadparam(struct adapter
>       *padapter, _nic_hdl pnetdev)
>       >
>       >       registry_par->vrtl_carrier_sense =
>       (u8)rtw_vrtl_carrier_sense ;
>       >       registry_par->vcs_type = (u8)rtw_vcs_type;
>       > -     registry_par->rts_thresh =(u16)rtw_rts_thresh;
>       > -     registry_par->frag_thresh =(u16)rtw_frag_thresh;
>       > +     registry_par->rts_thresh = (u16)rtw_rts_thresh;
>       > +     registry_par->frag_thresh = (u16)rtw_frag_thresh;
>       >       registry_par->preamble = (u8)rtw_preamble;
>       >       registry_par->scan_mode = (u8)rtw_scan_mode;
>       >       registry_par->adhoc_tx_pwr = (u8)rtw_adhoc_tx_pwr;
>       > @@ -440,7 +440,7 @@ u16 rtw_recv_select_queue(struct sk_buff
>       *skb)
>       >       u32 priority;
>       >       u8 *pdata = skb->data;
>       >
>       > -     memcpy(&eth_type, pdata+(ETH_ALEN<<1), 2);
>       > +     memcpy(&eth_type, pdata+(ETH_ALEN << 1), 2);
>
> The + should have space around it also.
>
> julia
>
> >
> >       switch (be16_to_cpu(eth_type)) {
> >               case ETH_P_IP:
> > @@ -652,8 +652,8 @@ static u8 rtw_init_default_value(struct adapter
> *padapter)
> >  #ifdef CONFIG_GTK_OL
> >       psecuritypriv->binstallKCK_KEK = _FAIL;
> >  #endif /* CONFIG_GTK_OL */
> > -     psecuritypriv->sw_encrypt =pregistrypriv->software_encrypt;
> > -     psecuritypriv->sw_decrypt =pregistrypriv->software_decrypt;
> > +     psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;
> > +     psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
> >
> >       psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /*
> open system */
> >       psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
> > @@ -748,7 +748,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
> >       pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
> >       pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
> >
> > -     _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING);
> > +     _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |
> _FW_UNDER_LINKING);
> >
> >       pwrctrlpriv->pwr_state_check_cnts = 0;
> >
> > @@ -777,7 +777,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
> >               goto exit;
> >       }
> >
> > -     padapter->cmdpriv.padapter =padapter;
> > +     padapter->cmdpriv.padapter = padapter;
> >
> >       if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL) {
> >               RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't
> init evt_priv\n"));
> > @@ -986,7 +986,7 @@ int _netdev_open(struct net_device *pnetdev)
> >
> >               DBG_871X("MAC Address = "MAC_FMT"\n",
> MAC_ARG(pnetdev->dev_addr));
> >
> > -             status =rtw_start_drv_threads(padapter);
> > +             status = rtw_start_drv_threads(padapter);
> >               if (status == _FAIL) {
> >                       DBG_871X("Initialize driver software resource
> Failed!\n");
> >                       goto netdev_open_error;
> > @@ -1641,7 +1641,7 @@ int rtw_resume_process_wow(struct adapter
> *padapter)
> >               }
> >
> >               /* Disable WOW, set H2C command */
> > -             poidparam.subcode =WOWLAN_DISABLE;
> > +             poidparam.subcode = WOWLAN_DISABLE;
> >               padapter->HalFunc.SetHwRegHandler(padapter,
> HW_VAR_WOWLAN, (u8 *)&poidparam);
> >
> >               psta = rtw_get_stainfo(&padapter->stapriv,
> get_bssid(&padapter->mlmepriv));
> > @@ -1705,7 +1705,7 @@ int rtw_resume_process_wow(struct adapter
> *padapter)
> >               DBG_871X_LEVEL(_drv_always_, "do not reset timer\n");
> >       }
> >
> > -     pwrpriv->wowlan_mode =false;
> > +     pwrpriv->wowlan_mode = false;
> >
> >       /* clean driver side wake up reason. */
> >       pwrpriv->wowlan_wake_reason = 0;
> > --
> > 1.9.1
> >
> > --
> > You received this message because you are subscribed to the Google
> Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it,
> send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to
> outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/1504981213-14584-1-git-s
> end-email-harshasharmaiitr%40gmail.com.
> > For more options, visit https://groups.google.com/d/optout.
> >
>
>
>
>