From: Mao Wenan <maowenan@huawei.com>
To: <davem@davemloft.net>, <socketcan@hartkopp.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<kernel-janitors@vger.kernel.org>, <maowenan@huawei.com>
Subject: [PATCH net-next v4] net: can: Fix compiling warnings for two functions
Date: Tue, 6 Aug 2019 09:37:01 +0800 [thread overview]
Message-ID: <20190806013701.71159-1-maowenan@huawei.com> (raw)
In-Reply-To: <20190805.103002.641507066504156536.davem@davemloft.net>
There are two warnings in net/can, fix them by setting
bcm_sock_no_ioctlcmd and raw_sock_no_ioctlcmd as static.
net/can/bcm.c:1683:5: warning: symbol 'bcm_sock_no_ioctlcmd' was not declared. Should it be static?
net/can/raw.c:840:5: warning: symbol 'raw_sock_no_ioctlcmd' was not declared. Should it be static?
Fixes: 473d924d7d46 ("can: fix ioctl function removal")
Signed-off-by: Mao Wenan <maowenan@huawei.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
v1->v2: change patch description typo error, 'warings' to 'warnings'.
v2->v3: change subject of patch.
v3->v4: change the alignment of two functions.
net/can/bcm.c | 4 ++--
net/can/raw.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/can/bcm.c b/net/can/bcm.c
index bf1d0bbecec8..eb1d28b8c46a 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1680,8 +1680,8 @@ static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
return size;
}
-int bcm_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,
- unsigned long arg)
+static int bcm_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,
+ unsigned long arg)
{
/* no ioctls for socket layer -> hand it down to NIC layer */
return -ENOIOCTLCMD;
diff --git a/net/can/raw.c b/net/can/raw.c
index da386f1fa815..a30aaecd9327 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -837,8 +837,8 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
return size;
}
-int raw_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,
- unsigned long arg)
+static int raw_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,
+ unsigned long arg)
{
/* no ioctls for socket layer -> hand it down to NIC layer */
return -ENOIOCTLCMD;
--
2.20.1
next prev parent reply other threads:[~2019-08-06 1:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-02 3:36 [PATCH net-next] net: can: Fix compiling warning Mao Wenan
2019-08-02 8:10 ` Oliver Hartkopp
2019-08-02 8:39 ` maowenan
2019-08-06 13:52 ` Dan Carpenter
2019-08-06 16:41 ` Oliver Hartkopp
2019-08-07 10:50 ` Dan Carpenter
2019-08-12 17:19 ` Kees Cook
2019-08-13 12:48 ` Dan Carpenter
2019-08-12 5:48 ` maowenan
2019-08-12 8:11 ` Oliver Hartkopp
2019-08-02 8:59 ` Sergei Shtylyov
2019-08-05 1:13 ` maowenan
2019-08-05 1:26 ` [PATCH net-next v2] " Mao Wenan
2019-08-05 10:56 ` [v2] " Markus Elfring
2019-08-05 11:57 ` [PATCH net-next v3] net: can: Fix compiling warnings for two functions Mao Wenan
2019-08-05 17:30 ` David Miller
2019-08-06 1:37 ` Mao Wenan [this message]
2019-08-06 11:37 ` [v4] " Markus Elfring
2019-08-06 14:40 ` [PATCH net-next v5] net: can: Fix sparse " Mao Wenan
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=20190806013701.71159-1-maowenan@huawei.com \
--to=maowenan@huawei.com \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=socketcan@hartkopp.net \
/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;
as well as URLs for NNTP newsgroup(s).