diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-24 00:20:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:53:35 -0500 |
commit | b24b8a247ff65c01b252025926fe564209fae4fc (patch) | |
tree | 8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/bluetooth/hidp | |
parent | a92aa318b4b369091fd80433c80e62838db8bc1c (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/bluetooth/hidp')
-rw-r--r-- | net/bluetooth/hidp/core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 4bbacddeb49d..782a22602b86 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c | |||
@@ -811,10 +811,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, | |||
811 | session->intr_sock = intr_sock; | 811 | session->intr_sock = intr_sock; |
812 | session->state = BT_CONNECTED; | 812 | session->state = BT_CONNECTED; |
813 | 813 | ||
814 | init_timer(&session->timer); | 814 | setup_timer(&session->timer, hidp_idle_timeout, (unsigned long)session); |
815 | |||
816 | session->timer.function = hidp_idle_timeout; | ||
817 | session->timer.data = (unsigned long) session; | ||
818 | 815 | ||
819 | skb_queue_head_init(&session->ctrl_transmit); | 816 | skb_queue_head_init(&session->ctrl_transmit); |
820 | skb_queue_head_init(&session->intr_transmit); | 817 | skb_queue_head_init(&session->intr_transmit); |