diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2008-12-10 18:18:31 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-10 18:18:31 -0500 |
commit | 5eaa65b240c5eb7bf2235eb9dd177c83e6e3832c (patch) | |
tree | 1a6b217cfc5b241b298a8765f68fcb5f711f9bc3 | |
parent | 2107fb8b5bf018be691afdd4c6ffaecf0c3307be (diff) |
net: Make static
Sparse asked whether these could be static.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/decnet/dn_dev.c | 2 | ||||
-rw-r--r-- | net/decnet/dn_route.c | 4 | ||||
-rw-r--r-- | net/dsa/mv88e6060.c | 4 | ||||
-rw-r--r-- | net/dsa/mv88e6123_61_65.c | 4 | ||||
-rw-r--r-- | net/dsa/mv88e6131.c | 4 | ||||
-rw-r--r-- | net/irda/irttp.c | 14 | ||||
-rw-r--r-- | net/irda/timer.c | 2 | ||||
-rw-r--r-- | net/phonet/sysctl.c | 2 | ||||
-rw-r--r-- | net/rxrpc/ar-connection.c | 2 | ||||
-rw-r--r-- | net/rxrpc/ar-connevent.c | 2 | ||||
-rw-r--r-- | net/rxrpc/ar-security.c | 2 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 |
13 files changed, 23 insertions, 23 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 424d86ac12fe..daf2b98b15fe 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -1106,7 +1106,7 @@ static void dn_dev_set_timer(struct net_device *dev) | |||
1106 | add_timer(&dn_db->timer); | 1106 | add_timer(&dn_db->timer); |
1107 | } | 1107 | } |
1108 | 1108 | ||
1109 | struct dn_dev *dn_dev_create(struct net_device *dev, int *err) | 1109 | static struct dn_dev *dn_dev_create(struct net_device *dev, int *err) |
1110 | { | 1110 | { |
1111 | int i; | 1111 | int i; |
1112 | struct dn_dev_parms *p = dn_dev_list; | 1112 | struct dn_dev_parms *p = dn_dev_list; |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index b33b254c52cb..c754670b7fca 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -311,7 +311,7 @@ static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route * | |||
311 | return 0; | 311 | return 0; |
312 | } | 312 | } |
313 | 313 | ||
314 | void dn_run_flush(unsigned long dummy) | 314 | static void dn_run_flush(unsigned long dummy) |
315 | { | 315 | { |
316 | int i; | 316 | int i; |
317 | struct dn_route *rt, *next; | 317 | struct dn_route *rt, *next; |
@@ -1422,7 +1422,7 @@ e_neighbour: | |||
1422 | goto done; | 1422 | goto done; |
1423 | } | 1423 | } |
1424 | 1424 | ||
1425 | int dn_route_input(struct sk_buff *skb) | 1425 | static int dn_route_input(struct sk_buff *skb) |
1426 | { | 1426 | { |
1427 | struct dn_route *rt; | 1427 | struct dn_route *rt; |
1428 | struct dn_skb_cb *cb = DN_SKB_CB(skb); | 1428 | struct dn_skb_cb *cb = DN_SKB_CB(skb); |
diff --git a/net/dsa/mv88e6060.c b/net/dsa/mv88e6060.c index bfb4a643c860..85081ae9fe89 100644 --- a/net/dsa/mv88e6060.c +++ b/net/dsa/mv88e6060.c | |||
@@ -273,14 +273,14 @@ static struct dsa_switch_driver mv88e6060_switch_driver = { | |||
273 | .poll_link = mv88e6060_poll_link, | 273 | .poll_link = mv88e6060_poll_link, |
274 | }; | 274 | }; |
275 | 275 | ||
276 | int __init mv88e6060_init(void) | 276 | static int __init mv88e6060_init(void) |
277 | { | 277 | { |
278 | register_switch_driver(&mv88e6060_switch_driver); | 278 | register_switch_driver(&mv88e6060_switch_driver); |
279 | return 0; | 279 | return 0; |
280 | } | 280 | } |
281 | module_init(mv88e6060_init); | 281 | module_init(mv88e6060_init); |
282 | 282 | ||
283 | void __exit mv88e6060_cleanup(void) | 283 | static void __exit mv88e6060_cleanup(void) |
284 | { | 284 | { |
285 | unregister_switch_driver(&mv88e6060_switch_driver); | 285 | unregister_switch_driver(&mv88e6060_switch_driver); |
286 | } | 286 | } |
diff --git a/net/dsa/mv88e6123_61_65.c b/net/dsa/mv88e6123_61_65.c index 555b164082fc..ec8c6a0482d3 100644 --- a/net/dsa/mv88e6123_61_65.c +++ b/net/dsa/mv88e6123_61_65.c | |||
@@ -407,14 +407,14 @@ static struct dsa_switch_driver mv88e6123_61_65_switch_driver = { | |||
407 | .get_sset_count = mv88e6123_61_65_get_sset_count, | 407 | .get_sset_count = mv88e6123_61_65_get_sset_count, |
408 | }; | 408 | }; |
409 | 409 | ||
410 | int __init mv88e6123_61_65_init(void) | 410 | static int __init mv88e6123_61_65_init(void) |
411 | { | 411 | { |
412 | register_switch_driver(&mv88e6123_61_65_switch_driver); | 412 | register_switch_driver(&mv88e6123_61_65_switch_driver); |
413 | return 0; | 413 | return 0; |
414 | } | 414 | } |
415 | module_init(mv88e6123_61_65_init); | 415 | module_init(mv88e6123_61_65_init); |
416 | 416 | ||
417 | void __exit mv88e6123_61_65_cleanup(void) | 417 | static void __exit mv88e6123_61_65_cleanup(void) |
418 | { | 418 | { |
419 | unregister_switch_driver(&mv88e6123_61_65_switch_driver); | 419 | unregister_switch_driver(&mv88e6123_61_65_switch_driver); |
420 | } | 420 | } |
diff --git a/net/dsa/mv88e6131.c b/net/dsa/mv88e6131.c index 36e01eb863a0..374d46a01265 100644 --- a/net/dsa/mv88e6131.c +++ b/net/dsa/mv88e6131.c | |||
@@ -366,14 +366,14 @@ static struct dsa_switch_driver mv88e6131_switch_driver = { | |||
366 | .get_sset_count = mv88e6131_get_sset_count, | 366 | .get_sset_count = mv88e6131_get_sset_count, |
367 | }; | 367 | }; |
368 | 368 | ||
369 | int __init mv88e6131_init(void) | 369 | static int __init mv88e6131_init(void) |
370 | { | 370 | { |
371 | register_switch_driver(&mv88e6131_switch_driver); | 371 | register_switch_driver(&mv88e6131_switch_driver); |
372 | return 0; | 372 | return 0; |
373 | } | 373 | } |
374 | module_init(mv88e6131_init); | 374 | module_init(mv88e6131_init); |
375 | 375 | ||
376 | void __exit mv88e6131_cleanup(void) | 376 | static void __exit mv88e6131_cleanup(void) |
377 | { | 377 | { |
378 | unregister_switch_driver(&mv88e6131_switch_driver); | 378 | unregister_switch_driver(&mv88e6131_switch_driver); |
379 | } | 379 | } |
diff --git a/net/irda/irttp.c b/net/irda/irttp.c index 74e439e80823..ecf4eb2717cb 100644 --- a/net/irda/irttp.c +++ b/net/irda/irttp.c | |||
@@ -201,7 +201,7 @@ static void irttp_todo_expired(unsigned long data) | |||
201 | * | 201 | * |
202 | * Flushes (removes all frames) in transitt-buffer (tx_list) | 202 | * Flushes (removes all frames) in transitt-buffer (tx_list) |
203 | */ | 203 | */ |
204 | void irttp_flush_queues(struct tsap_cb *self) | 204 | static void irttp_flush_queues(struct tsap_cb *self) |
205 | { | 205 | { |
206 | struct sk_buff* skb; | 206 | struct sk_buff* skb; |
207 | 207 | ||
@@ -1266,9 +1266,9 @@ static void irttp_connect_confirm(void *instance, void *sap, | |||
1266 | * Some other device is connecting to this TSAP | 1266 | * Some other device is connecting to this TSAP |
1267 | * | 1267 | * |
1268 | */ | 1268 | */ |
1269 | void irttp_connect_indication(void *instance, void *sap, struct qos_info *qos, | 1269 | static void irttp_connect_indication(void *instance, void *sap, |
1270 | __u32 max_seg_size, __u8 max_header_size, | 1270 | struct qos_info *qos, __u32 max_seg_size, __u8 max_header_size, |
1271 | struct sk_buff *skb) | 1271 | struct sk_buff *skb) |
1272 | { | 1272 | { |
1273 | struct tsap_cb *self; | 1273 | struct tsap_cb *self; |
1274 | struct lsap_cb *lsap; | 1274 | struct lsap_cb *lsap; |
@@ -1579,8 +1579,8 @@ EXPORT_SYMBOL(irttp_disconnect_request); | |||
1579 | * Disconnect indication, TSAP disconnected by peer? | 1579 | * Disconnect indication, TSAP disconnected by peer? |
1580 | * | 1580 | * |
1581 | */ | 1581 | */ |
1582 | void irttp_disconnect_indication(void *instance, void *sap, LM_REASON reason, | 1582 | static void irttp_disconnect_indication(void *instance, void *sap, |
1583 | struct sk_buff *skb) | 1583 | LM_REASON reason, struct sk_buff *skb) |
1584 | { | 1584 | { |
1585 | struct tsap_cb *self; | 1585 | struct tsap_cb *self; |
1586 | 1586 | ||
@@ -1664,7 +1664,7 @@ static void irttp_do_data_indication(struct tsap_cb *self, struct sk_buff *skb) | |||
1664 | * Check if we have any frames to be transmitted, or if we have any | 1664 | * Check if we have any frames to be transmitted, or if we have any |
1665 | * available credit to give away. | 1665 | * available credit to give away. |
1666 | */ | 1666 | */ |
1667 | void irttp_run_rx_queue(struct tsap_cb *self) | 1667 | static void irttp_run_rx_queue(struct tsap_cb *self) |
1668 | { | 1668 | { |
1669 | struct sk_buff *skb; | 1669 | struct sk_buff *skb; |
1670 | int more = 0; | 1670 | int more = 0; |
diff --git a/net/irda/timer.c b/net/irda/timer.c index d730099080a2..0335ba0cc593 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c | |||
@@ -219,7 +219,7 @@ static void irlap_backoff_timer_expired(void *data) | |||
219 | * | 219 | * |
220 | * | 220 | * |
221 | */ | 221 | */ |
222 | void irlap_media_busy_expired(void* data) | 222 | static void irlap_media_busy_expired(void *data) |
223 | { | 223 | { |
224 | struct irlap_cb *self = (struct irlap_cb *) data; | 224 | struct irlap_cb *self = (struct irlap_cb *) data; |
225 | 225 | ||
diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c index 0e3347bbdb12..7b5749ee2765 100644 --- a/net/phonet/sysctl.c +++ b/net/phonet/sysctl.c | |||
@@ -95,7 +95,7 @@ static struct ctl_table phonet_table[] = { | |||
95 | { .ctl_name = 0 } | 95 | { .ctl_name = 0 } |
96 | }; | 96 | }; |
97 | 97 | ||
98 | struct ctl_path phonet_ctl_path[] = { | 98 | static struct ctl_path phonet_ctl_path[] = { |
99 | { .procname = "net", .ctl_name = CTL_NET, }, | 99 | { .procname = "net", .ctl_name = CTL_NET, }, |
100 | { .procname = "phonet", .ctl_name = CTL_UNNUMBERED, }, | 100 | { .procname = "phonet", .ctl_name = CTL_UNNUMBERED, }, |
101 | { }, | 101 | { }, |
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c index 3869a5866752..0f1218b8d289 100644 --- a/net/rxrpc/ar-connection.c +++ b/net/rxrpc/ar-connection.c | |||
@@ -826,7 +826,7 @@ static void rxrpc_destroy_connection(struct rxrpc_connection *conn) | |||
826 | /* | 826 | /* |
827 | * reap dead connections | 827 | * reap dead connections |
828 | */ | 828 | */ |
829 | void rxrpc_connection_reaper(struct work_struct *work) | 829 | static void rxrpc_connection_reaper(struct work_struct *work) |
830 | { | 830 | { |
831 | struct rxrpc_connection *conn, *_p; | 831 | struct rxrpc_connection *conn, *_p; |
832 | unsigned long now, earliest, reap_time; | 832 | unsigned long now, earliest, reap_time; |
diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c index 1ada43d51165..dc5cb1e19509 100644 --- a/net/rxrpc/ar-connevent.c +++ b/net/rxrpc/ar-connevent.c | |||
@@ -126,7 +126,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn, | |||
126 | * mark a call as being on a now-secured channel | 126 | * mark a call as being on a now-secured channel |
127 | * - must be called with softirqs disabled | 127 | * - must be called with softirqs disabled |
128 | */ | 128 | */ |
129 | void rxrpc_call_is_secure(struct rxrpc_call *call) | 129 | static void rxrpc_call_is_secure(struct rxrpc_call *call) |
130 | { | 130 | { |
131 | _enter("%p", call); | 131 | _enter("%p", call); |
132 | if (call) { | 132 | if (call) { |
diff --git a/net/rxrpc/ar-security.c b/net/rxrpc/ar-security.c index 60d1d364430a..dc62920ee19a 100644 --- a/net/rxrpc/ar-security.c +++ b/net/rxrpc/ar-security.c | |||
@@ -40,7 +40,7 @@ static void rxrpc_security_put(struct rxrpc_security *sec) | |||
40 | /* | 40 | /* |
41 | * look up an rxrpc security module | 41 | * look up an rxrpc security module |
42 | */ | 42 | */ |
43 | struct rxrpc_security *rxrpc_security_lookup(u8 security_index) | 43 | static struct rxrpc_security *rxrpc_security_lookup(u8 security_index) |
44 | { | 44 | { |
45 | struct rxrpc_security *sec = NULL; | 45 | struct rxrpc_security *sec = NULL; |
46 | 46 | ||
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index 9a7a8e7ae038..a3334e3b73cc 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c | |||
@@ -69,7 +69,7 @@ | |||
69 | * array is only concerned with the reply we are assured that we have | 69 | * array is only concerned with the reply we are assured that we have |
70 | * on extra page for the RPCRMDA header. | 70 | * on extra page for the RPCRMDA header. |
71 | */ | 71 | */ |
72 | int fast_reg_xdr(struct svcxprt_rdma *xprt, | 72 | static int fast_reg_xdr(struct svcxprt_rdma *xprt, |
73 | struct xdr_buf *xdr, | 73 | struct xdr_buf *xdr, |
74 | struct svc_rdma_req_map *vec) | 74 | struct svc_rdma_req_map *vec) |
75 | { | 75 | { |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 8872914aa4cf..3d810e7df3fb 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
@@ -61,7 +61,7 @@ static int svc_rdma_has_wspace(struct svc_xprt *xprt); | |||
61 | static void rq_cq_reap(struct svcxprt_rdma *xprt); | 61 | static void rq_cq_reap(struct svcxprt_rdma *xprt); |
62 | static void sq_cq_reap(struct svcxprt_rdma *xprt); | 62 | static void sq_cq_reap(struct svcxprt_rdma *xprt); |
63 | 63 | ||
64 | DECLARE_TASKLET(dto_tasklet, dto_tasklet_func, 0UL); | 64 | static DECLARE_TASKLET(dto_tasklet, dto_tasklet_func, 0UL); |
65 | static DEFINE_SPINLOCK(dto_lock); | 65 | static DEFINE_SPINLOCK(dto_lock); |
66 | static LIST_HEAD(dto_xprt_q); | 66 | static LIST_HEAD(dto_xprt_q); |
67 | 67 | ||