redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

net: phonet: mark phonet_protocol as const 

The phonet_protocol structs don't need to be written by anyone and
so can be marked as const.

Signed-off-by: Lin Zhang <xiaolou4617@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
zero-colors
Lin Zhang 2017-10-06 01:40:35 +08:00 committed by David S. Miller
parent 64237470dd
commit 548ec11470
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/phonet/phonet.h
View File

@ -108,8 +108,10 @@ struct phonet_protocol {
int sock_type;
};
int phonet_proto_register(unsigned int protocol, struct phonet_protocol *pp);
void phonet_proto_unregister(unsigned int protocol, struct phonet_protocol *pp);
int phonet_proto_register(unsigned int protocol,
const struct phonet_protocol *pp);
void phonet_proto_unregister(unsigned int protocol,
const struct phonet_protocol *pp);
int phonet_sysctl_init(void);
void phonet_sysctl_exit(void);

15
net/phonet/af_phonet.c
View File

@ -35,11 +35,11 @@
#include <net/phonet/pn_dev.h>
/* Transport protocol registration */
static struct phonet_protocol *proto_tab[PHONET_NPROTO] __read_mostly;
static const struct phonet_protocol *proto_tab[PHONET_NPROTO] __read_mostly;
static struct phonet_protocol *phonet_proto_get(unsigned int protocol)
static const struct phonet_protocol *phonet_proto_get(unsigned int protocol)
{
struct phonet_protocol *pp;
const struct phonet_protocol *pp;
if (protocol >= PHONET_NPROTO)
return NULL;
@ -53,7 +53,7 @@ static struct phonet_protocol *phonet_proto_get(unsigned int protocol)
return pp;
}
static inline void phonet_proto_put(struct phonet_protocol *pp)
static inline void phonet_proto_put(const struct phonet_protocol *pp)
{
module_put(pp->prot->owner);
}
@ -65,7 +65,7 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
struct pn_sock *pn;
struct phonet_protocol *pnp;
const struct phonet_protocol *pnp;
int err;
if (!capable(CAP_SYS_ADMIN))
@ -470,7 +470,7 @@ static struct packet_type phonet_packet_type __read_mostly = {
static DEFINE_MUTEX(proto_tab_lock);
int __init_or_module phonet_proto_register(unsigned int protocol,
struct phonet_protocol *pp)
const struct phonet_protocol *pp)
{
int err = 0;
@ -492,7 +492,8 @@ int __init_or_module phonet_proto_register(unsigned int protocol,
}
EXPORT_SYMBOL(phonet_proto_register);
void phonet_proto_unregister(unsigned int protocol, struct phonet_protocol *pp)
void phonet_proto_unregister(unsigned int protocol,
const struct phonet_protocol *pp)
{
mutex_lock(&proto_tab_lock);
BUG_ON(proto_tab[protocol] != pp);

2
net/phonet/datagram.c
View File

@ -195,7 +195,7 @@ static struct proto pn_proto = {
.name = "PHONET",
};
static struct phonet_protocol pn_dgram_proto = {
static const struct phonet_protocol pn_dgram_proto = {
.ops = &phonet_dgram_ops,
.prot = &pn_proto,
.sock_type = SOCK_DGRAM,

2
net/phonet/pep.c
View File

@ -1351,7 +1351,7 @@ static struct proto pep_proto = {
.name = "PNPIPE",
};
static struct phonet_protocol pep_pn_proto = {
static const struct phonet_protocol pep_pn_proto = {
.ops = &phonet_stream_ops,
.prot = &pep_proto,
.sock_type = SOCK_SEQPACKET,