* [PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants
@ 2015-10-13 10:25 Shivani Bhardwaj
2015-10-13 10:41 ` [Outreachy kernel] " Julia Lawall
0 siblings, 1 reply; 3+ messages in thread
From: Shivani Bhardwaj @ 2015-10-13 10:25 UTC (permalink / raw)
To: outreachy-kernel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Outreachy kernel] [PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants
2015-10-13 10:25 [PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants Shivani Bhardwaj
@ 2015-10-13 10:41 ` Julia Lawall
2015-10-13 10:44 ` Shivani Bhardwaj
0 siblings, 1 reply; 3+ messages in thread
From: Julia Lawall @ 2015-10-13 10:41 UTC (permalink / raw)
To: Shivani Bhardwaj; +Cc: outreachy-kernel
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.
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Outreachy kernel] [PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants
2015-10-13 10:41 ` [Outreachy kernel] " Julia Lawall
@ 2015-10-13 10:44 ` Shivani Bhardwaj
0 siblings, 0 replies; 3+ messages in thread
From: Shivani Bhardwaj @ 2015-10-13 10:44 UTC (permalink / raw)
To: Julia Lawall; +Cc: outreachy-kernel
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.
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-13 10:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-13 10:25 [PATCH v2] Staging: wilc1000: wilc_wfi_cfgoperations: Remove unnecessary constants Shivani Bhardwaj
2015-10-13 10:41 ` [Outreachy kernel] " Julia Lawall
2015-10-13 10:44 ` Shivani Bhardwaj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.