From: Thibaut Robert <thibaut.robert@gmail.com>
To: Joe Perches <joe@perches.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Michalis Pappas <mpappas@fastmail.fm>,
Davide Gianforte <davide@gengisdave.org>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Thibaut Robert <thibaut.robert@gmail.com>
Subject: [PATCH] Staging: gdm72xx: fix coding style
Date: Tue, 30 Sep 2014 12:23:12 +0200 [thread overview]
Message-ID: <1412072592-8682-1-git-send-email-thibaut.robert@gmail.com> (raw)
In-Reply-To: <1412015484.4302.51.camel@joe-AO725>
Remove unnecessary else after return.
Follow coding style for curly braces around single statements.
Fix a typo in error message.
Signed-off-by: Thibaut Robert <thibaut.robert@gmail.com>
---
drivers/staging/gdm72xx/netlink_k.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 9bf00e6..31862e5 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -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;
}
--
1.9.1
next prev parent reply other threads:[~2014-09-30 10:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-29 18:15 Thibaut Robert
2014-09-29 18:31 ` Joe Perches
2014-09-30 10:20 ` Thibaut Robert
2014-09-30 10:23 ` Thibaut Robert [this message]
2014-09-30 11:02 ` Thibaut Robert
2014-09-30 11:03 ` [PATCH] staging: gdm72xx: fix typo and " Thibaut Robert
2014-10-05 1:18 ` Greg Kroah-Hartman
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=1412072592-8682-1-git-send-email-thibaut.robert@gmail.com \
--to=thibaut.robert@gmail.com \
--cc=davide@gengisdave.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mpappas@fastmail.fm \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome