[PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants

[PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants

[Shivani Bhardwaj]

Remove constants wherever not required and change variables to bool type
to get rid of constants.
Semantic patch used:

@@
type T;
identifier i;
constant C;
position p != e.p;
@@

- T i@p;
  <+... when != i
- i = C;
  ...+>

Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
---
Changes in v2:
	-Improve the patch by completely eliminating the constant.

 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 6472777..f6259f7 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1714,7 +1714,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 {
 	u32 i;
 	s32 s32Error = 0;
-	u8 flag = 0;
+	bool flag = 0;
 
 	struct wilc_priv *priv = wiphy_priv(wiphy);
 
@@ -1725,7 +1725,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 		if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,
 				 ETH_ALEN)) {
 			/*If bssid already exists and pmkid value needs to reset*/
-			flag = PMKID_FOUND;
+			flag = 1;
 			PRINT_D(CFG80211_DBG, "PMKID already exists\n");
 			break;
 		}
@@ -1736,7 +1736,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 			    ETH_ALEN);
 		memcpy(priv->pmkid_list.pmkidlist[i].pmkid, pmksa->pmkid,
 			    PMKID_LEN);
-		if (!(flag == PMKID_FOUND))
+		if (!flag)
 			priv->pmkid_list.numpmkid++;
 	} else {
 		PRINT_ER("Invalid PMKID index\n");
@@ -1764,7 +1764,6 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 {
 
 	u32 i;
-	u8 flag = 0;
 	s32 s32Error = 0;
 
 	struct wilc_priv *priv = wiphy_priv(wiphy);
@@ -1777,7 +1776,6 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 			/*If bssid is found, reset the values*/
 			PRINT_D(CFG80211_DBG, "Reseting PMKID values\n");
 			memset(&priv->pmkid_list.pmkidlist[i], 0, sizeof(struct host_if_pmkid));
-			flag = PMKID_FOUND;
 			break;
 		}
 	}
-- 
2.1.0

Re: [Outreachy kernel] [PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants

[Julia Lawall]

On Tue, 13 Oct 2015, Shivani Bhardwaj wrote:

> Remove constants wherever not required and change variables to bool type
> to get rid of constants.

This seems like two unrelated things.  I think you could put them in
different patches.

> Semantic patch used:
>
> @@
> type T;
> identifier i;
> constant C;
> position p != e.p;
> @@
>
> - T i@p;
>   <+... when != i
> - i = C;
>   ...+>
>
> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> ---
> Changes in v2:
> 	-Improve the patch by completely eliminating the constant.
>
>  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> index 6472777..f6259f7 100644
> --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
> @@ -1714,7 +1714,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>  {
>  	u32 i;
>  	s32 s32Error = 0;
> -	u8 flag = 0;
> +	bool flag = 0;

Actually, my thought was to have a bool variable called pmkid_found.  That
would be more understandable than flag.

Also the initial value should be false, not 0.

>  	struct wilc_priv *priv = wiphy_priv(wiphy);
>
> @@ -1725,7 +1725,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>  		if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,
>  				 ETH_ALEN)) {
>  			/*If bssid already exists and pmkid value needs to reset*/
> -			flag = PMKID_FOUND;
> +			flag = 1;

And here the value would be true.

julia

>  			PRINT_D(CFG80211_DBG, "PMKID already exists\n");
>  			break;
>  		}
> @@ -1736,7 +1736,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>  			    ETH_ALEN);
>  		memcpy(priv->pmkid_list.pmkidlist[i].pmkid, pmksa->pmkid,
>  			    PMKID_LEN);
> -		if (!(flag == PMKID_FOUND))
> +		if (!flag)
>  			priv->pmkid_list.numpmkid++;
>  	} else {
>  		PRINT_ER("Invalid PMKID index\n");
> @@ -1764,7 +1764,6 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>  {
>
>  	u32 i;
> -	u8 flag = 0;
>  	s32 s32Error = 0;
>
>  	struct wilc_priv *priv = wiphy_priv(wiphy);
> @@ -1777,7 +1776,6 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>  			/*If bssid is found, reset the values*/
>  			PRINT_D(CFG80211_DBG, "Reseting PMKID values\n");
>  			memset(&priv->pmkid_list.pmkidlist[i], 0, sizeof(struct host_if_pmkid));
> -			flag = PMKID_FOUND;
>  			break;
>  		}
>  	}
> --
> 2.1.0
>
> --
> 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/20151013102548.GA8383%40ubuntu.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants

[Shivani Bhardwaj]

On Tue, Oct 13, 2015 at 4:11 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> On Tue, 13 Oct 2015, Shivani Bhardwaj wrote:
>
>> Remove constants wherever not required and change variables to bool type
>> to get rid of constants.
>
> This seems like two unrelated things.  I think you could put them in
> different patches.
>
>> Semantic patch used:
>>
>> @@
>> type T;
>> identifier i;
>> constant C;
>> position p != e.p;
>> @@
>>
>> - T i@p;
>>   <+... when != i
>> - i = C;
>>   ...+>
>>
>> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> ---
>> Changes in v2:
>>       -Improve the patch by completely eliminating the constant.
>>
>>  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 +++-----
>>  1 file changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
>> index 6472777..f6259f7 100644
>> --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
>> +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
>> @@ -1714,7 +1714,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>>  {
>>       u32 i;
>>       s32 s32Error = 0;
>> -     u8 flag = 0;
>> +     bool flag = 0;
>
> Actually, my thought was to have a bool variable called pmkid_found.  That
> would be more understandable than flag.
>
> Also the initial value should be false, not 0.
>

Fine. I'm sending a patch set.
Thank you. :)

>>       struct wilc_priv *priv = wiphy_priv(wiphy);
>>
>> @@ -1725,7 +1725,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>>               if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,
>>                                ETH_ALEN)) {
>>                       /*If bssid already exists and pmkid value needs to reset*/
>> -                     flag = PMKID_FOUND;
>> +                     flag = 1;
>
> And here the value would be true.
>
> julia
>
>>                       PRINT_D(CFG80211_DBG, "PMKID already exists\n");
>>                       break;
>>               }
>> @@ -1736,7 +1736,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>>                           ETH_ALEN);
>>               memcpy(priv->pmkid_list.pmkidlist[i].pmkid, pmksa->pmkid,
>>                           PMKID_LEN);
>> -             if (!(flag == PMKID_FOUND))
>> +             if (!flag)
>>                       priv->pmkid_list.numpmkid++;
>>       } else {
>>               PRINT_ER("Invalid PMKID index\n");
>> @@ -1764,7 +1764,6 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>>  {
>>
>>       u32 i;
>> -     u8 flag = 0;
>>       s32 s32Error = 0;
>>
>>       struct wilc_priv *priv = wiphy_priv(wiphy);
>> @@ -1777,7 +1776,6 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
>>                       /*If bssid is found, reset the values*/
>>                       PRINT_D(CFG80211_DBG, "Reseting PMKID values\n");
>>                       memset(&priv->pmkid_list.pmkidlist[i], 0, sizeof(struct host_if_pmkid));
>> -                     flag = PMKID_FOUND;
>>                       break;
>>               }
>>       }
>> --
>> 2.1.0
>>
>> --
>> 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/20151013102548.GA8383%40ubuntu.
>> For more options, visit https://groups.google.com/d/optout.
>>