Skip to contentSkip to conversation

Staging: gdm72xx: fix coding style

PATCH In review Thibaut Robert 3 participants 7 messages Sep 29, 2014 – Oct 5, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: gdm72xx: fix coding style

This patch remove a checkstyle warning in netlink_k.c.
Note: This is my homework of the day.

---
 drivers/staging/gdm72xx/netlink_k.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +6 -7
index 9bf00e6..0a5831a 100644
@@ -147,12 +147,11 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 
 	if (!ret) {
 		return len;
-	} else {
-		if (ret != -ESRCH) {
-			pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
-			       group, type, len, ret);
-		}
-		ret = 0;
 	}
-	return ret;
+
+	if (ret != -ESRCH) {
+		pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+		       group, type, len, ret);
+	}
+	return 0;
 }
Signature · 1 line
1.9.1
#1 lore raw
Quoted 2 lines · Thibaut Robert

This patch remove a checkstyle warning in netlink_k.c.
Note: This is my homework of the day.

The "Note: " line isn't useful for a commit message. Neither is the checkpatch warning bit.

Maybe the commit message could be something like:
"Remove unnecessary else after return".

drivers/staging/gdm72xx/netlink_k.c

Quoted 1 line
drivers/staging/gdm72xx/netlink_k.c +0 -0

[]

Quoted 7 lines
drivers/staging/gdm72xx/netlink_k.c +0 -3
@@ -147,12 +147,11 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 
 	if (!ret) {
 		return len;
-	} else {
-		if (ret != -ESRCH) {
-			pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",

drivers/staging/gdm72xx/netlink_k.c int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) · line 155

Quoted 10 lines
drivers/staging/gdm72xx/netlink_k.c +5 -4
-			       group, type, len, ret);
-		}
-		ret = 0;
 	}
-	return ret;
+
+	if (ret != -ESRCH) {
+		pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+		       group, type, len, ret);
+	}

OK, but you don't need the braces around the pr_err.

My preference is to also fix the typo in the function and would be something like:

---
 drivers/staging/gdm72xx/netlink_k.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +10 -13
index 9bf00e6..43d2a49 100644
@@ -120,9 +120,9 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	struct nlmsghdr *nlh;
 	int ret = 0;
 
-	if (group > ND_MAX_GROUP) {
-		pr_err("Group %d is invalied.\n", group);
-		pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
+	if (group < 0 || group > ND_MAX_GROUP) {
+		pr_err("Invalid group %d (valid groups are 0 to %d)\n",
+		       group, ND_MAX_GROUP);
 		return -EINVAL;
 	}
 
@@ -144,15 +144,12 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	NETLINK_CB(skb).dst_group = 0;
 
 	ret = netlink_broadcast(sock, skb, 0, group+1, GFP_ATOMIC);
-
-	if (!ret) {
+	if (!ret)
 		return len;
-	} else {
-		if (ret != -ESRCH) {
-			pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
-			       group, type, len, ret);
-		}
-		ret = 0;
-	}
-	return ret;
+
+	if (ret != -ESRCH)
+		pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+		       group, type, len, ret);
+
+	return 0;
 }
#2 lore raw
Quoted 71 lines · Joe Perches
Quoted 2 lines · Thibaut Robert

This patch remove a checkstyle warning in netlink_k.c.
Note: This is my homework of the day.

The "Note: " line isn't useful for a commit message. Neither is the checkpatch warning bit.

Maybe the commit message could be something like:
"Remove unnecessary else after return".

drivers/staging/gdm72xx/netlink_k.c

Quoted 1 line
drivers/staging/gdm72xx/netlink_k.c +0 -0

[]

Quoted 7 lines
drivers/staging/gdm72xx/netlink_k.c +0 -3
@@ -147,12 +147,11 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 
 	if (!ret) {
 		return len;
-	} else {
-		if (ret != -ESRCH) {
-			pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",

drivers/staging/gdm72xx/netlink_k.c int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) · line 155

Quoted 10 lines
drivers/staging/gdm72xx/netlink_k.c +5 -4
-			       group, type, len, ret);
-		}
-		ret = 0;
 	}
-	return ret;
+
+	if (ret != -ESRCH) {
+		pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+		       group, type, len, ret);
+	}

OK, but you don't need the braces around the pr_err.

My preference is to also fix the typo in the function and would be something like:

---
 drivers/staging/gdm72xx/netlink_k.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +4 -10
index 9bf00e6..43d2a49 100644
@@ -120,9 +120,9 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	struct nlmsghdr *nlh;
 	int ret = 0;
 
-	if (group > ND_MAX_GROUP) {
-		pr_err("Group %d is invalied.\n", group);
-		pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
+	if (group < 0 || group > ND_MAX_GROUP) {
+		pr_err("Invalid group %d (valid groups are 0 to %d)\n",
+		       group, ND_MAX_GROUP);
 		return -EINVAL;
 	}
 
@@ -144,15 +144,12 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	NETLINK_CB(skb).dst_group = 0;
 
 	ret = netlink_broadcast(sock, skb, 0, group+1, GFP_ATOMIC);
-
-	if (!ret) {
+	if (!ret)
 		return len;
-	} else {
-		if (ret != -ESRCH) {
-			pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
-			       group, type, len, ret);
-		}

drivers/staging/gdm72xx/netlink_k.c int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) · line 155

Quoted 10 lines
drivers/staging/gdm72xx/netlink_k.c +6 -3
-		ret = 0;
-	}
-	return ret;
+
+	if (ret != -ESRCH)
+		pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+		       group, type, len, ret);
+
+	return 0;
 }

Thanks for this newbie friendly attitude. That's much appreciated. An updated patch will follow.

#3 lore raw

PATCH 1/1 Staging: gdm72xx: fix coding style

In reply to Joe Perches

Remove unnecessary else after return.
Follow coding style for curly braces around single statements. Fix a typo in error message.

---
 drivers/staging/gdm72xx/netlink_k.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +11 -13
index 9bf00e6..31862e5 100644
@@ -71,10 +71,11 @@ static void netlink_rcv_cb(struct sk_buff *skb)
 			if (dev) {
 				rcv_cb(dev, nlh->nlmsg_type, msg, mlen);
 				dev_put(dev);
-			} else
+			} else {
 				netdev_err(skb->dev,
 					   "dev_get_by_index(%d) is not found.\n",
 					   ifindex);
+			}
 		} else {
 			netdev_err(skb->dev, "Unregistered Callback\n");
 		}
@@ -120,9 +121,9 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	struct nlmsghdr *nlh;
 	int ret = 0;
 
-	if (group > ND_MAX_GROUP) {
-		pr_err("Group %d is invalied.\n", group);
-		pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
+	if (group < 0 || group > ND_MAX_GROUP) {
+		pr_err("Invalid group %d (valid groups are 0 to %d)\n",
+			group, ND_MAX_GROUP);
 		return -EINVAL;
 	}
 
@@ -145,14 +146,11 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 
 	ret = netlink_broadcast(sock, skb, 0, group+1, GFP_ATOMIC);
 
-	if (!ret) {
+	if (!ret)
 		return len;
-	} else {
-		if (ret != -ESRCH) {
-			pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
-			       group, type, len, ret);
-		}
-		ret = 0;
-	}
-	return ret;
+
+	if (ret != -ESRCH)
+		pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+		       group, type, len, ret);
+	return 0;
 }
Signature · 1 line
1.9.1
#4 lore raw
Quoted 63 lines · Thibaut Robert

Remove unnecessary else after return.
Follow coding style for curly braces around single statements. Fix a typo in error message.

---
 drivers/staging/gdm72xx/netlink_k.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +11 -13
index 9bf00e6..31862e5 100644
@@ -71,10 +71,11 @@ static void netlink_rcv_cb(struct sk_buff *skb)
 			if (dev) {
 				rcv_cb(dev, nlh->nlmsg_type, msg, mlen);
 				dev_put(dev);
-			} else
+			} else {
 				netdev_err(skb->dev,
 					   "dev_get_by_index(%d) is not found.\n",
 					   ifindex);
+			}
 		} else {
 			netdev_err(skb->dev, "Unregistered Callback\n");
 		}
@@ -120,9 +121,9 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	struct nlmsghdr *nlh;
 	int ret = 0;
 
-	if (group > ND_MAX_GROUP) {
-		pr_err("Group %d is invalied.\n", group);
-		pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
+	if (group < 0 || group > ND_MAX_GROUP) {
+		pr_err("Invalid group %d (valid groups are 0 to %d)\n",
+			group, ND_MAX_GROUP);
 		return -EINVAL;
 	}
 
@@ -145,14 +146,11 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 
 	ret = netlink_broadcast(sock, skb, 0, group+1, GFP_ATOMIC);
 
-	if (!ret) {
+	if (!ret)
 		return len;
-	} else {
-		if (ret != -ESRCH) {
-			pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
-			       group, type, len, ret);
-		}
-		ret = 0;
-	}
-	return ret;
+
+	if (ret != -ESRCH)
+		pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+		       group, type, len, ret);
+	return 0;
 }
Signature · 1 line
1.9.1

I've just seen that some identical changes have already been pushed in the meanwhile, the previous patch does not apply. An new patch will follow (mainly for the typo correction)

#5 lore raw

PATCH 1/1 staging: gdm72xx: fix typo and coding style

In reply to Joe Perches

Fix a typo in error message.
Add missing curling braces to conform to coding style. Improve readibility.

---
 drivers/staging/gdm72xx/netlink_k.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +8 -8
index 9d78bfc..31862e5 100644
@@ -71,10 +71,11 @@ static void netlink_rcv_cb(struct sk_buff *skb)
 			if (dev) {
 				rcv_cb(dev, nlh->nlmsg_type, msg, mlen);
 				dev_put(dev);
-			} else
+			} else {
 				netdev_err(skb->dev,
 					   "dev_get_by_index(%d) is not found.\n",
 					   ifindex);
+			}
 		} else {
 			netdev_err(skb->dev, "Unregistered Callback\n");
 		}
@@ -120,9 +121,9 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	struct nlmsghdr *nlh;
 	int ret = 0;
 
-	if (group > ND_MAX_GROUP) {
-		pr_err("Group %d is invalied.\n", group);
-		pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
+	if (group < 0 || group > ND_MAX_GROUP) {
+		pr_err("Invalid group %d (valid groups are 0 to %d)\n",
+			group, ND_MAX_GROUP);
 		return -EINVAL;
 	}
 
@@ -147,10 +148,9 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 
 	if (!ret)
 		return len;
-	if (ret != -ESRCH) {
+
+	if (ret != -ESRCH)
 		pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
 		       group, type, len, ret);
-	}
-	ret = 0;
-	return ret;
+	return 0;
 }
Signature · 1 line
1.9.1
#6 lore raw

Re: [PATCH] staging: gdm72xx: fix typo and coding style

Quoted 3 lines · Thibaut Robert

Fix a typo in error message.
Add missing curling braces to conform to coding style. Improve readibility.

That's three things in one patch :(

Please only do one thing per patch.

Quoted 24 lines
---
 drivers/staging/gdm72xx/netlink_k.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +2 -1
index 9d78bfc..31862e5 100644
@@ -71,10 +71,11 @@ static void netlink_rcv_cb(struct sk_buff *skb)
 			if (dev) {
 				rcv_cb(dev, nlh->nlmsg_type, msg, mlen);
 				dev_put(dev);
-			} else
+			} else {
 				netdev_err(skb->dev,
 					   "dev_get_by_index(%d) is not found.\n",
 					   ifindex);
+			}
 		} else {
 			netdev_err(skb->dev, "Unregistered Callback\n");
 		}

drivers/staging/gdm72xx/netlink_k.c int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) · line 124

Quoted 7 lines
drivers/staging/gdm72xx/netlink_k.c +1 -3
@@ -120,9 +121,9 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	struct nlmsghdr *nlh;
 	int ret = 0;
 
-	if (group > ND_MAX_GROUP) {
-		pr_err("Group %d is invalied.\n", group);
-		pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
+	if (group < 0 || group > ND_MAX_GROUP) {

How can group be less than 0?

thanks,

greg k-h