From: Pavel Machek <pavel@ucw.cz>
To: pali.rohar@gmail.com, sre@debian.org, sre@ring0.de,
kernel list <linux-kernel@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
linux-omap@vger.kernel.org, tony@atomide.com, khilman@kernel.org,
aaro.koskinen@iki.fi, ivo.g.dimitrov.75@gmail.com,
patrikbachan@gmail.com
Subject: -n900 (not mainline): fix compilation with 3.20-rc0
Date: Wed, 11 Feb 2015 23:23:42 +0100 [thread overview]
Message-ID: <20150211222342.GE11313@amd> (raw)
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
WARNING: multiple messages have this Message-ID (diff)
From: pavel@ucw.cz (Pavel Machek)
To: linux-arm-kernel@lists.infradead.org
Subject: -n900 (not mainline): fix compilation with 3.20-rc0
Date: Wed, 11 Feb 2015 23:23:42 +0100 [thread overview]
Message-ID: <20150211222342.GE11313@amd> (raw)
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
next reply other threads:[~2015-02-11 22:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-11 22:23 Pavel Machek [this message]
2015-02-11 22:23 ` -n900 (not mainline): fix compilation with 3.20-rc0 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150211222342.GE11313@amd \
--to=pavel@ucw.cz \
--cc=aaro.koskinen@iki.fi \
--cc=ivo.g.dimitrov.75@gmail.com \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=pali.rohar@gmail.com \
--cc=patrikbachan@gmail.com \
--cc=sre@debian.org \
--cc=sre@ring0.de \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.