All of lore.kernel.org
 help / color / mirror / Atom feed
* -n900 (not mainline): fix compilation with 3.20-rc0
@ 2015-02-11 22:23 ` Pavel Machek
  0 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2015-02-11 22:23 UTC (permalink / raw)
  To: pali.rohar, sre, sre, kernel list, linux-arm-kernel, linux-omap,
	tony, khilman, aaro.koskinen, ivo.g.dimitrov.75, patrikbachan


commit 02aa41563bd0f14268d2142ab69694880d3425a1
Author: Pavel <pavel@ucw.cz>
Date:   Wed Feb 11 23:22:51 2015 +0100

    Fix compilation of wl1251 specific parts with 3.20-rc0.
    
    Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/net/wireless/ti/wl1251/netlink.c b/drivers/net/wireless/ti/wl1251/netlink.c
index e5f5a45..90a5486 100644
--- a/drivers/net/wireless/ti/wl1251/netlink.c
+++ b/drivers/net/wireless/ti/wl1251/netlink.c
@@ -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);
 

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* -n900 (not mainline): fix compilation with 3.20-rc0
@ 2015-02-11 22:23 ` Pavel Machek
  0 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2015-02-11 22:23 UTC (permalink / raw)
  To: linux-arm-kernel


commit 02aa41563bd0f14268d2142ab69694880d3425a1
Author: Pavel <pavel@ucw.cz>
Date:   Wed Feb 11 23:22:51 2015 +0100

    Fix compilation of wl1251 specific parts with 3.20-rc0.
    
    Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/net/wireless/ti/wl1251/netlink.c b/drivers/net/wireless/ti/wl1251/netlink.c
index e5f5a45..90a5486 100644
--- a/drivers/net/wireless/ti/wl1251/netlink.c
+++ b/drivers/net/wireless/ti/wl1251/netlink.c
@@ -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);
 

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: -n900 (not mainline): fix compilation with 3.20-rc0
  2015-02-11 22:23 ` Pavel Machek
@ 2015-02-11 22:33   ` Sergei Shtylyov
  -1 siblings, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2015-02-11 22:33 UTC (permalink / raw)
  To: Pavel Machek, pali.rohar, sre, sre, kernel list,
	linux-arm-kernel, linux-omap, tony, khilman, aaro.koskinen,
	ivo.g.dimitrov.75, patrikbachan

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...

> commit 02aa41563bd0f14268d2142ab69694880d3425a1
> Author: Pavel <pavel@ucw.cz>
> Date:   Wed Feb 11 23:22:51 2015 +0100

    No need for this header.

>      Fix compilation of wl1251 specific parts with 3.20-rc0.

>      Signed-off-by: Pavel Machek <pavel@ucw.cz>

    Please don't indent the change log.

> diff --git a/drivers/net/wireless/ti/wl1251/netlink.c b/drivers/net/wireless/ti/wl1251/netlink.c
> index e5f5a45..90a5486 100644
> --- a/drivers/net/wireless/ti/wl1251/netlink.c
> +++ b/drivers/net/wireless/ti/wl1251/netlink.c
[...]
> @@ -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);
> -
> +	

    Remove this stray tab please.

>   	return genlmsg_reply(msg, info);
>
>   nla_put_failure:

WBR, Sergei


^ permalink raw reply	[flat|nested] 6+ messages in thread

* -n900 (not mainline): fix compilation with 3.20-rc0
@ 2015-02-11 22:33   ` Sergei Shtylyov
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2015-02-11 22:33 UTC (permalink / raw)
  To: linux-arm-kernel

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...

> commit 02aa41563bd0f14268d2142ab69694880d3425a1
> Author: Pavel <pavel@ucw.cz>
> Date:   Wed Feb 11 23:22:51 2015 +0100

    No need for this header.

>      Fix compilation of wl1251 specific parts with 3.20-rc0.

>      Signed-off-by: Pavel Machek <pavel@ucw.cz>

    Please don't indent the change log.

> diff --git a/drivers/net/wireless/ti/wl1251/netlink.c b/drivers/net/wireless/ti/wl1251/netlink.c
> index e5f5a45..90a5486 100644
> --- a/drivers/net/wireless/ti/wl1251/netlink.c
> +++ b/drivers/net/wireless/ti/wl1251/netlink.c
[...]
> @@ -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);
> -
> +	

    Remove this stray tab please.

>   	return genlmsg_reply(msg, info);
>
>   nla_put_failure:

WBR, Sergei

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: -n900 (not mainline): fix compilation with 3.20-rc0
  2015-02-11 22:33   ` Sergei Shtylyov
@ 2015-02-12  0:07     ` Pavel Machek
  -1 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2015-02-12  0:07 UTC (permalink / raw)
  To: Sergei Shtylyov
  Cc: pali.rohar, sre, sre, kernel list, linux-arm-kernel, linux-omap,
	tony, khilman, aaro.koskinen, ivo.g.dimitrov.75, patrikbachan

On Thu 2015-02-12 01:33:39, Sergei Shtylyov wrote:
> 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
								
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* -n900 (not mainline): fix compilation with 3.20-rc0
@ 2015-02-12  0:07     ` Pavel Machek
  0 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2015-02-12  0:07 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu 2015-02-12 01:33:39, Sergei Shtylyov wrote:
> 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
								
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-02-12  0:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-11 22:23 -n900 (not mainline): fix compilation with 3.20-rc0 Pavel Machek
2015-02-11 22:23 ` Pavel Machek
2015-02-11 22:33 ` Sergei Shtylyov
2015-02-11 22:33   ` Sergei Shtylyov
2015-02-12  0:07   ` Pavel Machek
2015-02-12  0:07     ` Pavel Machek

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.