Fix various issues

PATCH Superseded Shivani Bhardwaj 3 participants 9 messages Oct 13, 2015 Staging

Share & tools

Shivani Bhardwaj

author

2015-10-13 11:04 UTC #0 lore raw

cover Fix various issues

This patch removes unused code and changes the variable type to more effective one.
After applying this patch, code becomes better.

Shivani Bhardwaj (2):
Staging: wilc1000: wilc_wfi_cfgoperations: Remove unused code
Staging: wilc1000: wilc_wfi_cfgoperations: Change variable to bool

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

Signature · 1 line

2.1.0

Shivani Bhardwaj

author

2015-10-13 11:04 UTC #1 lore raw

PATCH 1/2 Staging: wilc1000: wilc_wfi_cfgoperations: Remove unused code

Remove a flag variable which is not used anywhere in the code. 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 <[email protected]>

---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 --
 1 file changed, 2 deletions(-)

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +0 -2

index 6472777..d2e6f55 100644
@@ -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;
 		}
 	}

Signature · 1 line

2.1.0

Shivani Bhardwaj

author

2015-10-13 11:04 UTC #2 lore raw

PATCH 2/2 Staging: wilc1000: wilc_wfi_cfgoperations: Change variable to bool

In reply to Shivani Bhardwaj

Change variable of the type u8 to bool as the only values acquired by it are true or false.

Signed-off-by Shivani Bhardwaj <[email protected]>

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

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +3 -3

index d2e6f55..e4c134a 100644
@@ -1714,7 +1714,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 {
 	u32 i;
 	s32 s32Error = 0;
-	u8 flag = 0;
+	bool pmkid_found = false;
 
 	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;
+			pmkid_found = true;
 			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 (!pmkid_found)
 			priv->pmkid_list.numpmkid++;
 	} else {
 		PRINT_ER("Invalid PMKID index\n");

Signature · 1 line

2.1.0

Julia Lawall

2015-10-13 11:20 UTC #3 lore raw

Re: [Outreachy kernel] [PATCH 2/2] Staging: wilc1000: wilc_wfi_cfgoperations: Change variable to bool

Quoted 2 lines · Shivani Bhardwaj

Change variable of the type u8 to bool as the only values acquired by it are true or false.

This looks better, but now I think that PMKID_FOUND is not used anywhere, so its definition can be removed.

julia

Quoted 46 lines

Signed-off-by Shivani Bhardwaj <[email protected]>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +3 -4
index d2e6f55..e4c134a 100644
@@ -1714,7 +1714,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 {
 	u32 i;
 	s32 s32Error = 0;
-	u8 flag = 0;
+	bool pmkid_found = false;
 
 	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;
+			pmkid_found = true;
 			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 (!pmkid_found)
 			priv->pmkid_list.numpmkid++;
 	} else {
 		PRINT_ER("Invalid PMKID index\n");
--
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 [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20f17185a553556d1d6d806811bf068cd727a689.1444733999.git.shivanib134%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Shivani Bhardwaj

author

2015-10-13 12:46 UTC #4 lore raw

Re: [Outreachy kernel] [PATCH 2/2] Staging: wilc1000: wilc_wfi_cfgoperations: Change variable to bool

Quoted 10 lines · Julia Lawall

Quoted 2 lines · Shivani Bhardwaj
Change variable of the type u8 to bool as the only values acquired by it are true or false.
This looks better, but now I think that PMKID_FOUND is not used anywhere, so its definition can be removed.
julia

I've removed that from header, should I send a v3 with header file's changes included? Or I can send it individually?
Thank you

Quoted 46 lines

Signed-off-by Shivani Bhardwaj <[email protected]>

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

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +3 -4

index d2e6f55..e4c134a 100644
@@ -1714,7 +1714,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 {
      u32 i;
      s32 s32Error = 0;
-     u8 flag = 0;
+     bool pmkid_found = false;
 
      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;
+                     pmkid_found = true;
                      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 (!pmkid_found)
                      priv->pmkid_list.numpmkid++;
      } else {
              PRINT_ER("Invalid PMKID index\n");
--

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 [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20f17185a553556d1d6d806811bf068cd727a689.1444733999.git.shivanib134%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Julia Lawall

2015-10-13 12:49 UTC #5 lore raw

Re: [Outreachy kernel] [PATCH 2/2] Staging: wilc1000: wilc_wfi_cfgoperations: Change variable to bool

Quoted 6 lines · Shivani Bhardwaj

Quoted 5 lines · Julia Lawall
Quoted 2 lines · Shivani Bhardwaj
Change variable of the type u8 to bool as the only values acquired by it are true or false.

Quoted 7 lines

Quoted 5 lines
This looks better, but now I think that PMKID_FOUND is not used anywhere, so its definition can be removed.
julia
I've removed that from header, should I send a v3 with header file's changes included? Or I can send it individually?

Removing that from the header is only valid if these other changes are done, so to ensure the patches get applied in the right order, it could be better to send a v3, with that being the third patch.

julia

Quoted 56 lines

Thank you
Quoted 39 lines
Quoted 39 lines
Signed-off-by Shivani Bhardwaj <[email protected]>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +3 -4
index d2e6f55..e4c134a 100644
@@ -1714,7 +1714,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 {
      u32 i;
      s32 s32Error = 0;
-     u8 flag = 0;
+     bool pmkid_found = false;
 
      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;
+                     pmkid_found = true;
                      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 (!pmkid_found)
                      priv->pmkid_list.numpmkid++;
      } else {
              PRINT_ER("Invalid PMKID index\n");
--
2.1.0
Quoted 7 lines
Quoted 7 lines
--
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 [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20f17185a553556d1d6d806811bf068cd727a689.1444733999.git.shivanib134%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
--
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 [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/CAKHNQQFMF%3DdEO2%3D1fZD%2Bg6HiwV9xfAqjSe8AD21AsOF6P5sbqA%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

Shivani Bhardwaj

author

2015-10-13 12:51 UTC #6 lore raw

Re: [Outreachy kernel] [PATCH 2/2] Staging: wilc1000: wilc_wfi_cfgoperations: Change variable to bool

Quoted 15 lines · Julia Lawall

Quoted 11 lines · Shivani Bhardwaj
Quoted 10 lines · Julia Lawall
Quoted 2 lines · Shivani Bhardwaj
Change variable of the type u8 to bool as the only values acquired by it are true or false.
This looks better, but now I think that PMKID_FOUND is not used anywhere, so its definition can be removed.
julia

Quoted 9 lines

Quoted 2 lines
I've removed that from header, should I send a v3 with header file's changes included? Or I can send it individually?
Removing that from the header is only valid if these other changes are done, so to ensure the patches get applied in the right order, it could be better to send a v3, with that being the third patch.
julia

OK. Thank you! I'm sending new version.

Quoted 56 lines

Quoted 56 lines
Thank you
Quoted 39 lines
Quoted 39 lines
Signed-off-by Shivani Bhardwaj <[email protected]>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +3 -4
index d2e6f55..e4c134a 100644
@@ -1714,7 +1714,7 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 {
      u32 i;
      s32 s32Error = 0;
-     u8 flag = 0;
+     bool pmkid_found = false;
 
      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;
+                     pmkid_found = true;
                      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 (!pmkid_found)
                      priv->pmkid_list.numpmkid++;
      } else {
              PRINT_ER("Invalid PMKID index\n");
--
2.1.0
Quoted 7 lines
Quoted 7 lines
--
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 [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20f17185a553556d1d6d806811bf068cd727a689.1444733999.git.shivanib134%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
--
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 [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/CAKHNQQFMF%3DdEO2%3D1fZD%2Bg6HiwV9xfAqjSe8AD21AsOF6P5sbqA%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

Greg KH

maintainer

2015-10-13 14:25 UTC #7 lore raw

In reply to Shivani Bhardwaj

Quoted 3 lines · Shivani Bhardwaj

This patch removes unused code and changes the variable type to more effective one.
After applying this patch, code becomes better.

Ok, not to pick on just this patch, but everyone's 0/X emails need a bit more work please.

First off, they need 'staging' in them, and then need to be a bit more descriptive as to what the patch series does (hint, this one is really vague.)

Don't worry about this one, I'll take it, but in the future, if _everyone_ could work on their 0/X emails, I would greatly appreciate it.

thanks,

greg k-h

Shivani Bhardwaj

author

2015-10-13 14:26 UTC #8 lore raw

Quoted 12 lines · Greg KH

Quoted 3 lines · Shivani Bhardwaj
This patch removes unused code and changes the variable type to more effective one.
After applying this patch, code becomes better.
Ok, not to pick on just this patch, but everyone's 0/X emails need a bit more work please.
First off, they need 'staging' in them, and then need to be a bit more descriptive as to what the patch series does (hint, this one is really vague.)

Quoted 7 lines

Don't worry about this one, I'll take it, but in the future, if _everyone_ could work on their 0/X emails, I would greatly appreciate it.
thanks,
greg k-h

I'll take care. Thanks, Greg.