[PATCH] Staging: wilc1000: Replace the name of a variable

[PATCH] Staging: wilc1000: Replace the name of a variable

[Mihaela Muraru]

This patch replace the name '*Error' variable with 'err'.

Found and solve with Coccinelle:
@r1@
type s;
identifier sn =~ "Error";
identifier f;
type p;
expression c;
@@

f(...) {

<...
(
-p sn = c;
+p err = c;
|
-sn
+err
)
...>
}

Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 138 +++++++++++-----------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 483a6b6..8c47558 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -603,7 +603,7 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
 {
 	struct wilc_priv *priv;
 	u32 i;
-	s32 s32Error = 0;
+	s32 err = 0;
 	u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS];
 	struct hidden_network strHiddenNetwork;
 	struct wilc_vif *vif;
@@ -641,14 +641,14 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
 					strHiddenNetwork.n_ssids -= 1;
 				}
 			}
-			s32Error = wilc_scan(vif, USER_SCAN, ACTIVE_SCAN,
+			err = wilc_scan(vif, USER_SCAN, ACTIVE_SCAN,
 					     au8ScanChanList,
 					     request->n_channels,
 					     (const u8 *)request->ie,
 					     request->ie_len, CfgScanResult,
 					     (void *)priv, &strHiddenNetwork);
 		} else {
-			s32Error = wilc_scan(vif, USER_SCAN, ACTIVE_SCAN,
+			err = wilc_scan(vif, USER_SCAN, ACTIVE_SCAN,
 					     au8ScanChanList,
 					     request->n_channels,
 					     (const u8 *)request->ie,
@@ -659,16 +659,16 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
 		netdev_err(priv->dev, "Requested scanned channels over\n");
 	}
 
-	if (s32Error != 0)
-		s32Error = -EBUSY;
+	if (err != 0)
+		err = -EBUSY;
 
-	return s32Error;
+	return err;
 }
 
 static int connect(struct wiphy *wiphy, struct net_device *dev,
 		   struct cfg80211_connect_params *sme)
 {
-	s32 s32Error = 0;
+	s32 err = 0;
 	u32 i;
 	u8 u8security = NO_ENCRYPT;
 	enum AUTHTYPE tenuAuth_type = ANY;
@@ -706,9 +706,9 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
 	if (i < last_scanned_cnt) {
 		pstrNetworkInfo = &last_scanned_shadow[i];
 	} else {
-		s32Error = -ENOENT;
+		err = -ENOENT;
 		wilc_connecting = 0;
-		return s32Error;
+		return err;
 	}
 
 	memset(priv->WILC_WFI_wep_key, 0, sizeof(priv->WILC_WFI_wep_key));
@@ -756,10 +756,10 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
 			else
 				u8security = ENCRYPT_ENABLED | WPA | AES;
 		} else {
-			s32Error = -ENOTSUPP;
+			err = -ENOTSUPP;
 			netdev_err(dev, "Not supported cipher\n");
 			wilc_connecting = 0;
-			return s32Error;
+			return err;
 		}
 	}
 
@@ -804,25 +804,25 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
 
 	wilc_wlan_set_bssid(dev, pstrNetworkInfo->bssid, STATION_MODE);
 
-	s32Error = wilc_set_join_req(vif, pstrNetworkInfo->bssid, sme->ssid,
+	err = wilc_set_join_req(vif, pstrNetworkInfo->bssid, sme->ssid,
 				     sme->ssid_len, sme->ie, sme->ie_len,
 				     CfgConnectResult, (void *)priv,
 				     u8security, tenuAuth_type,
 				     pstrNetworkInfo->ch,
 				     pstrNetworkInfo->join_params);
-	if (s32Error != 0) {
+	if (err != 0) {
 		netdev_err(dev, "wilc_set_join_req(): Error\n");
-		s32Error = -ENOENT;
+		err = -ENOENT;
 		wilc_connecting = 0;
-		return s32Error;
+		return err;
 	}
 
-	return s32Error;
+	return err;
 }
 
 static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code)
 {
-	s32 s32Error = 0;
+	s32 err = 0;
 	struct wilc_priv *priv;
 	struct host_if_drv *pstrWFIDrv;
 	struct wilc_vif *vif;
@@ -853,13 +853,13 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co
 	wilc_ie = false;
 	pstrWFIDrv->p2p_timeout = 0;
 
-	s32Error = wilc_disconnect(vif, reason_code);
-	if (s32Error != 0) {
+	err = wilc_disconnect(vif, reason_code);
+	if (err != 0) {
 		netdev_err(priv->dev, "Error in disconnecting\n");
-		s32Error = -EINVAL;
+		err = -EINVAL;
 	}
 
-	return s32Error;
+	return err;
 }
 
 static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
@@ -867,7 +867,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
 		   const u8 *mac_addr, struct key_params *params)
 
 {
-	s32 s32Error = 0, KeyLen = params->key_len;
+	s32 err = 0, KeyLen = params->key_len;
 	struct wilc_priv *priv;
 	const u8 *pu8RxMic = NULL;
 	const u8 *pu8TxMic = NULL;
@@ -1070,10 +1070,10 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
 
 	default:
 		netdev_err(netdev, "Not supported cipher\n");
-		s32Error = -ENOTSUPP;
+		err = -ENOTSUPP;
 	}
 
-	return s32Error;
+	return err;
 }
 
 static int del_key(struct wiphy *wiphy, struct net_device *netdev,
@@ -1249,7 +1249,7 @@ static int change_bss(struct wiphy *wiphy, struct net_device *dev,
 
 static int set_wiphy_params(struct wiphy *wiphy, u32 changed)
 {
-	s32 s32Error = 0;
+	s32 err = 0;
 	struct cfg_param_attr pstrCfgParamVal;
 	struct wilc_priv *priv;
 	struct wilc_vif *vif;
@@ -1277,18 +1277,18 @@ static int set_wiphy_params(struct wiphy *wiphy, u32 changed)
 		pstrCfgParamVal.rts_threshold = priv->dev->ieee80211_ptr->wiphy->rts_threshold;
 	}
 
-	s32Error = wilc_hif_set_cfg(vif, &pstrCfgParamVal);
-	if (s32Error)
+	err = wilc_hif_set_cfg(vif, &pstrCfgParamVal);
+	if (err)
 		netdev_err(priv->dev, "Error in setting WIPHY PARAMS\n");
 
-	return s32Error;
+	return err;
 }
 
 static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 		     struct cfg80211_pmksa *pmksa)
 {
 	u32 i;
-	s32 s32Error = 0;
+	s32 err = 0;
 	u8 flag = 0;
 	struct wilc_vif *vif;
 	struct wilc_priv *priv = wiphy_priv(wiphy);
@@ -1312,20 +1312,20 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 			priv->pmkid_list.numpmkid++;
 	} else {
 		netdev_err(netdev, "Invalid PMKID index\n");
-		s32Error = -EINVAL;
+		err = -EINVAL;
 	}
 
-	if (!s32Error)
-		s32Error = wilc_set_pmkid_info(vif, &priv->pmkid_list);
+	if (!err)
+		err = wilc_set_pmkid_info(vif, &priv->pmkid_list);
 
-	return s32Error;
+	return err;
 }
 
 static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 		     struct cfg80211_pmksa *pmksa)
 {
 	u32 i;
-	s32 s32Error = 0;
+	s32 err = 0;
 
 	struct wilc_priv *priv = wiphy_priv(wiphy);
 
@@ -1348,10 +1348,10 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 		}
 		priv->pmkid_list.numpmkid--;
 	} else {
-		s32Error = -EINVAL;
+		err = -EINVAL;
 	}
 
-	return s32Error;
+	return err;
 }
 
 static int flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
@@ -1571,7 +1571,7 @@ static int remain_on_channel(struct wiphy *wiphy,
 			     struct ieee80211_channel *chan,
 			     unsigned int duration, u64 *cookie)
 {
-	s32 s32Error = 0;
+	s32 err = 0;
 	struct wilc_priv *priv;
 	struct wilc_vif *vif;
 
@@ -1580,7 +1580,7 @@ static int remain_on_channel(struct wiphy *wiphy,
 
 	if (wdev->iftype == NL80211_IFTYPE_AP) {
 		netdev_dbg(vif->ndev, "Required while in AP mode\n");
-		return s32Error;
+		return err;
 	}
 
 	curr_channel = chan->hw_value;
@@ -1917,7 +1917,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev,
 {
 	struct cfg80211_beacon_data *beacon = &(settings->beacon);
 	struct wilc_priv *priv;
-	s32 s32Error = 0;
+	s32 err = 0;
 	struct wilc *wl;
 	struct wilc_vif *vif;
 
@@ -1925,9 +1925,9 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev,
 	vif = netdev_priv(dev);
 	wl = vif->wilc;
 
-	s32Error = set_channel(wiphy, &settings->chandef);
+	err = set_channel(wiphy, &settings->chandef);
 
-	if (s32Error != 0)
+	if (err != 0)
 		netdev_err(dev, "Error in setting channel\n");
 
 	wilc_wlan_set_bssid(dev, wl->vif[vif->idx]->src_addr, AP_MODE);
@@ -1955,7 +1955,7 @@ static int change_beacon(struct wiphy *wiphy, struct net_device *dev,
 
 static int stop_ap(struct wiphy *wiphy, struct net_device *dev)
 {
-	s32 s32Error = 0;
+	s32 err = 0;
 	struct wilc_priv *priv;
 	struct wilc_vif *vif;
 	u8 NullBssid[ETH_ALEN] = {0};
@@ -1968,18 +1968,18 @@ static int stop_ap(struct wiphy *wiphy, struct net_device *dev)
 
 	wilc_wlan_set_bssid(dev, NullBssid, AP_MODE);
 
-	s32Error = wilc_del_beacon(vif);
+	err = wilc_del_beacon(vif);
 
-	if (s32Error)
+	if (err)
 		netdev_err(dev, "Host delete beacon fail\n");
 
-	return s32Error;
+	return err;
 }
 
 static int add_station(struct wiphy *wiphy, struct net_device *dev,
 		       const u8 *mac, struct station_parameters *params)
 {
-	s32 s32Error = 0;
+	s32 err = 0;
 	struct wilc_priv *priv;
 	struct add_sta_param strStaParams = { {0} };
 	struct wilc_vif *vif;
@@ -2014,19 +2014,19 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
 		strStaParams.flags_mask = params->sta_flags_mask;
 		strStaParams.flags_set = params->sta_flags_set;
 
-		s32Error = wilc_add_station(vif, &strStaParams);
-		if (s32Error)
+		err = wilc_add_station(vif, &strStaParams);
+		if (err)
 			netdev_err(dev, "Host add station fail\n");
 	}
 
-	return s32Error;
+	return err;
 }
 
 static int del_station(struct wiphy *wiphy, struct net_device *dev,
 		       struct station_del_parameters *params)
 {
 	const u8 *mac = params->mac;
-	s32 s32Error = 0;
+	s32 err = 0;
 	struct wilc_priv *priv;
 	struct wilc_vif *vif;
 
@@ -2038,21 +2038,21 @@ static int del_station(struct wiphy *wiphy, struct net_device *dev,
 
 	if (vif->iftype == AP_MODE || vif->iftype == GO_MODE) {
 		if (!mac)
-			s32Error = wilc_del_allstation(vif,
+			err = wilc_del_allstation(vif,
 				     priv->assoc_stainfo.au8Sta_AssociatedBss);
 
-		s32Error = wilc_del_station(vif, mac);
+		err = wilc_del_station(vif, mac);
 
-		if (s32Error)
+		if (err)
 			netdev_err(dev, "Host delete station fail\n");
 	}
-	return s32Error;
+	return err;
 }
 
 static int change_station(struct wiphy *wiphy, struct net_device *dev,
 			  const u8 *mac, struct station_parameters *params)
 {
-	s32 s32Error = 0;
+	s32 err = 0;
 	struct wilc_priv *priv;
 	struct add_sta_param strStaParams = { {0} };
 	struct wilc_vif *vif;
@@ -2086,11 +2086,11 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
 		strStaParams.flags_mask = params->sta_flags_mask;
 		strStaParams.flags_set = params->sta_flags_set;
 
-		s32Error = wilc_edit_station(vif, &strStaParams);
-		if (s32Error)
+		err = wilc_edit_station(vif, &strStaParams);
+		if (err)
 			netdev_err(dev, "Host edit station fail\n");
 	}
-	return s32Error;
+	return err;
 }
 
 static struct wireless_dev *add_virtual_intf(struct wiphy *wiphy,
@@ -2268,7 +2268,7 @@ struct wireless_dev *wilc_create_wiphy(struct net_device *net, struct device *de
 {
 	struct wilc_priv *priv;
 	struct wireless_dev *wdev;
-	s32 s32Error = 0;
+	s32 err = 0;
 
 	wdev = WILC_WFI_CfgAlloc();
 	if (!wdev) {
@@ -2297,8 +2297,8 @@ struct wireless_dev *wilc_create_wiphy(struct net_device *net, struct device *de
 
 	set_wiphy_dev(wdev->wiphy, dev);
 
-	s32Error = wiphy_register(wdev->wiphy);
-	if (s32Error)
+	err = wiphy_register(wdev->wiphy);
+	if (err)
 		netdev_err(net, "Cannot register wiphy device\n");
 
 	priv->dev = net;
@@ -2307,7 +2307,7 @@ struct wireless_dev *wilc_create_wiphy(struct net_device *net, struct device *de
 
 int wilc_init_host_int(struct net_device *net)
 {
-	int s32Error = 0;
+	int err = 0;
 
 	struct wilc_priv *priv;
 
@@ -2323,16 +2323,16 @@ int wilc_init_host_int(struct net_device *net)
 	priv->bInP2PlistenState = false;
 
 	mutex_init(&priv->scan_req_lock);
-	s32Error = wilc_init(net, &priv->hif_drv);
-	if (s32Error)
+	err = wilc_init(net, &priv->hif_drv);
+	if (err)
 		netdev_err(net, "Error while initializing hostinterface\n");
 
-	return s32Error;
+	return err;
 }
 
 int wilc_deinit_host_int(struct net_device *net)
 {
-	int s32Error = 0;
+	int err = 0;
 	struct wilc_vif *vif;
 	struct wilc_priv *priv;
 
@@ -2345,16 +2345,16 @@ int wilc_deinit_host_int(struct net_device *net)
 
 	op_ifcs--;
 
-	s32Error = wilc_deinit(vif);
+	err = wilc_deinit(vif);
 
 	clear_shadow_scan();
 	if (op_ifcs == 0)
 		del_timer_sync(&wilc_during_ip_timer);
 
-	if (s32Error)
+	if (err)
 		netdev_err(net, "Error while deintializing host interface\n");
 
-	return s32Error;
+	return err;
 }
 
 void wilc_free_wiphy(struct net_device *net)
-- 
2.7.4

Re: [PATCH] Staging: wilc1000: Replace the name of a variable

[Greg Kroah-Hartman]

On Mon, Oct 17, 2016 at 09:30:27AM +0300, Mihaela Muraru wrote:
> This patch replace the name '*Error' variable with 'err'.

This says what you are doing, but I don't understand why you want to
replace a variable name like this.

Also you have an odd extra space in your subject line :(

> 
> Found and solve with Coccinelle:
> @r1@
> type s;
> identifier sn =~ "Error";
> identifier f;
> type p;
> expression c;
> @@
> 
> f(...) {
> 
> <...
> (
> -p sn = c;
> +p err = c;
> |
> -sn
> +err
> )
> ...>
> }
> 
> Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
> ---
>  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 138 +++++++++++-----------
>  1 file changed, 69 insertions(+), 69 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> index 483a6b6..8c47558 100644
> --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> @@ -603,7 +603,7 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
>  {
>  	struct wilc_priv *priv;
>  	u32 i;
> -	s32 s32Error = 0;
> +	s32 err = 0;

Also, shouldn't this just be 'int'?

thanks,

greg k-h

Re: [PATCH] Staging: wilc1000: Replace the name of a variable

[Muraru Mihaela]

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

On 17 Oct 2016 10:34, "Muraru Mihaela" <mihaela.muraru21@gmail.com> wrote:
>
> On 17 Oct 2016 09:58, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
wrote:
> >
> > On Mon, Oct 17, 2016 at 09:30:27AM +0300, Mihaela Muraru wrote:
> > > This patch replace the name '*Error' variable with 'err'.
> >
> > This says what you are doing, but I don't understand why you want to
> > replace a variable name like this.
>
Julia asked my  to replace it.
>
> > Also you have an odd extra space in your subject line :(
I will resend it later, I don't have acces to my computer now.
> >
> > >
> > > Found and solve with Coccinelle:
> > > @r1@
> > > type s;
> > > identifier sn =~ "Error";
> > > identifier f;
> > > type p;
> > > expression c;
> > > @@
> > >
> > > f(...) {
> > >
> > > <...
> > > (
> > > -p sn = c;
> > > +p err = c;
> > > |
> > > -sn
> > > +err
> > > )
> > > ...>
> > > }
> > >
> > > Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
> > > ---
> > >  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 138
+++++++++++-----------
> > >  1 file changed, 69 insertions(+), 69 deletions(-)
> > >
> > > diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > > index 483a6b6..8c47558 100644
> > > --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > > +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > > @@ -603,7 +603,7 @@ static int scan(struct wiphy *wiphy, struct
cfg80211_scan_request *request)
> > >  {
> > >       struct wilc_priv *priv;
> > >       u32 i;
> > > -     s32 s32Error = 0;
> > > +     s32 err = 0;
> >
> > Also, shouldn't this just be 'int'?
No.
I just modify the name, not the type.
>
> > thanks,
> >
> > greg k-h

[-- Attachment #2: Type: text/html, Size: 2758 bytes --]

Re: [Outreachy kernel] Re: [PATCH] Staging: wilc1000: Replace the name of a variable

[Julia Lawall]

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



On Mon, 17 Oct 2016, Muraru Mihaela wrote:

>
> On 17 Oct 2016 10:34, "Muraru Mihaela" <mihaela.muraru21@gmail.com> wrote:
> >
> > On 17 Oct 2016 09:58, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
> wrote:
> > >
> > > On Mon, Oct 17, 2016 at 09:30:27AM +0300, Mihaela Muraru wrote:
> > > > This patch replace the name '*Error' variable with 'err'.
> > >
> > > This says what you are doing, but I don't understand why you want to
> > > replace a variable name like this.
> >
> Julia asked my  to replace it.
> >
> > > Also you have an odd extra space in your subject line :(
> I will resend it later, I don't have acces to my computer now.
> > >
> > > >
> > > > Found and solve with Coccinelle:
> > > > @r1@
> > > > type s;
> > > > identifier sn =~ "Error";
> > > > identifier f;
> > > > type p;
> > > > expression c;
> > > > @@
> > > >
> > > > f(...) {
> > > >
> > > > <...
> > > > (
> > > > -p sn = c;
> > > > +p err = c;
> > > > |
> > > > -sn
> > > > +err
> > > > )
> > > > ...>
> > > > }
> > > >
> > > > Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
> > > > ---
> > > >  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 138
> +++++++++++-----------
> > > >  1 file changed, 69 insertions(+), 69 deletions(-)
> > > >
> > > > diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > > > index 483a6b6..8c47558 100644
> > > > --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > > > +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> > > > @@ -603,7 +603,7 @@ static int scan(struct wiphy *wiphy, struct
> cfg80211_scan_request *request)
> > > >  {
> > > >       struct wilc_priv *priv;
> > > >       u32 i;
> > > > -     s32 s32Error = 0;
> > > > +     s32 err = 0;
> > >
> > > Also, shouldn't this just be 'int'?
> No.
> I just modify the name, not the type.

I think you could do both at once.

julia


> >
> > > thanks,
> > >
> > > greg k-h
>
> --
> 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/CANRJjP0j8T1NAXPXo%2BD3k
> Q2ARn8Teue%2Bu3V265cR5Y0Y0rK3sg%40mail.gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
>