Skip to contentSkip to conversation

-n900 (not mainline): fix compilation with 3.20-rc0

PATCH Pavel Machek 2 participants 3 messages Feb 11, 2015 – Feb 12, 2015 TI wilink wireless drivers

lore
Share & tools
lore

Pavel Machek

author
#0 lore raw

commit 02aa41563bd0f14268d2142ab69694880d3425a1

Author: Pavel <[email protected]>
Date:   Wed Feb 11 23:22:51 2015 +0100

Fix compilation of wl1251 specific parts with 3.20-rc0.

Signed-off-by Pavel Machek <[email protected]>
drivers/net/wireless/ti/wl1251/netlink.c +5 -21
index e5f5a45..90a5486 100644
@@ -190,11 +190,7 @@ static int wl1251_nl_test_cmd(struct sk_buff *skb, struct genl_info *info)
 			sizeof(*cmd), cmd))
 			goto nla_put_failure;
 
-		ret = genlmsg_end(msg, hdr);
-		if (ret < 0) {
-			wl1251_error("%s() failed", __func__);
-			goto nla_put_failure;
-		}
+		genlmsg_end(msg, hdr);
 
 		wl1251_debug(DEBUG_NETLINK, "TEST cmd sent, answer");
 		ret = genlmsg_reply(msg, info);

@@ -270,11 +266,7 @@ static int wl1251_nl_interrogate(struct sk_buff *skb, struct genl_info *info)
 	if (nla_put(msg, WL1251_NL_ATTR_CMD_IE_ANSWER, cmd_ie_len, cmd))
 		goto nla_put_failure;
 
-	ret = genlmsg_end(msg, hdr);
-	if (ret < 0) {
-		wl1251_error("%s() failed", __func__);
-		goto nla_put_failure;
-	}
+	genlmsg_end(msg, hdr);
 
 	kfree(cmd);
 	return genlmsg_reply(msg, info);

@@ -406,14 +398,10 @@ static int wl1251_nl_phy_reg_read(struct sk_buff *skb, struct genl_info *info)
 	if (nla_put_u32(msg, WL1251_NL_ATTR_REG_VAL, *reg_value))
 		goto nla_put_failure;
 
-	ret = genlmsg_end(msg, hdr);
-	if (ret < 0) {
-		wl1251_error("%s() failed", __func__);
-		goto nla_put_failure;
-	}
+	genlmsg_end(msg, hdr);
 
 	kfree(reg_value);
-
+	
 	return genlmsg_reply(msg, info);
 
 nla_put_failure:

@@ -509,11 +497,7 @@ static int wl1251_nl_reg_read(struct sk_buff *skb, struct genl_info *info)
 	if (nla_put_u32(msg, WL1251_NL_ATTR_REG_VAL, val))
 		goto nla_put_failure;
 
-	ret = genlmsg_end(msg, hdr);
-	if (ret < 0) {
-		wl1251_error("%s() failed", __func__);
-		goto nla_put_failure;
-	}
+	genlmsg_end(msg, hdr);
 
 	return genlmsg_reply(msg, info);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#1 lore raw

Hello.

On 02/12/2015 01:23 AM, Pavel Machek wrote:

This looked like a patch in its final form, so I decided to comment on it...

Quoted 3 lines

commit 02aa41563bd0f14268d2142ab69694880d3425a1

Author: Pavel <[email protected]>
Date:   Wed Feb 11 23:22:51 2015 +0100

No need for this header.

Quoted 3 lines

Fix compilation of wl1251 specific parts with 3.20-rc0.

Signed-off-by Pavel Machek <[email protected]>

Please don't indent the change log.

Quoted 4 lines
drivers/net/wireless/ti/wl1251/netlink.c +0 -0
index e5f5a45..90a5486 100644

[...]

Quoted 4 lines
drivers/net/wireless/ti/wl1251/netlink.c +0 -0
@@ -406,14 +398,10 @@ static int wl1251_nl_phy_reg_read(struct sk_buff *skb, struct genl_info *info)
  	if (nla_put_u32(msg, WL1251_NL_ATTR_REG_VAL, *reg_value))
  		goto nla_put_failure;

drivers/net/wireless/ti/wl1251/netlink.c static int wl1251_nl_phy_reg_read(struct sk_buff *skb, struct genl_info *info) · line 404

Quoted 10 lines
drivers/net/wireless/ti/wl1251/netlink.c +2 -6
-	ret = genlmsg_end(msg, hdr);
-	if (ret < 0) {
-		wl1251_error("%s() failed", __func__);
-		goto nla_put_failure;
-	}
+	genlmsg_end(msg, hdr);
 
  	kfree(reg_value);
-
+

Remove this stray tab please.

drivers/net/wireless/ti/wl1251/netlink.c static int wl1251_nl_phy_reg_read(struct sk_buff *skb, struct genl_info *info) · line 407

Quoted 3 lines
drivers/net/wireless/ti/wl1251/netlink.c +0 -0
  	return genlmsg_reply(msg, info);
 
  nla_put_failure:

WBR, Sergei

author
#2 lore raw
Quoted 6 lines · Sergei Shtylyov

Hello.

On 02/12/2015 01:23 AM, Pavel Machek wrote:

This looked like a patch in its final form, so I decided to
comment on it...

Yeah, well, (not mainline) in the subject should have told you that there's no need to nitpick on this, sorry.

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html