aboutsummaryrefslogtreecommitdiffstats
path: root/net/iucv
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-01-24 00:20:07 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:53:35 -0500
commitb24b8a247ff65c01b252025926fe564209fae4fc (patch)
tree8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/iucv
parenta92aa318b4b369091fd80433c80e62838db8bc1c (diff)
[NET]: Convert init_timer into setup_timer
Many-many code in the kernel initialized the timer->function and timer->data together with calling init_timer(timer). There is already a helper for this. Use it for networking code. The patch is HUGE, but makes the code 130 lines shorter (98 insertions(+), 228 deletions(-)). Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/iucv')
-rw-r--r--net/iucv/af_iucv.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index aef66458035..2255e3c082e 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -94,13 +94,6 @@ static void iucv_sock_clear_timer(struct sock *sk)
94 sk_stop_timer(sk, &sk->sk_timer); 94 sk_stop_timer(sk, &sk->sk_timer);
95} 95}
96 96
97static void iucv_sock_init_timer(struct sock *sk)
98{
99 init_timer(&sk->sk_timer);
100 sk->sk_timer.function = iucv_sock_timeout;
101 sk->sk_timer.data = (unsigned long)sk;
102}
103
104static struct sock *__iucv_get_sock_by_name(char *nm) 97static struct sock *__iucv_get_sock_by_name(char *nm)
105{ 98{
106 struct sock *sk; 99 struct sock *sk;
@@ -238,7 +231,7 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio)
238 sk->sk_protocol = proto; 231 sk->sk_protocol = proto;
239 sk->sk_state = IUCV_OPEN; 232 sk->sk_state = IUCV_OPEN;
240 233
241 iucv_sock_init_timer(sk); 234 setup_timer(&sk->sk_timer, iucv_sock_timeout, (unsigned long)sk);
242 235
243 iucv_sock_link(&iucv_sk_list, sk); 236 iucv_sock_link(&iucv_sk_list, sk);
244 return sk; 237 return sk;