mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
[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 <[email protected]> Acked-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
a92aa318b4
commit
b24b8a247f
47 changed files with 98 additions and 228 deletions
|
|
@ -247,10 +247,7 @@ void x25_link_device_up(struct net_device *dev)
|
|||
return;
|
||||
|
||||
skb_queue_head_init(&nb->queue);
|
||||
|
||||
init_timer(&nb->t20timer);
|
||||
nb->t20timer.data = (unsigned long)nb;
|
||||
nb->t20timer.function = &x25_t20timer_expiry;
|
||||
setup_timer(&nb->t20timer, x25_t20timer_expiry, (unsigned long)nb);
|
||||
|
||||
dev_hold(dev);
|
||||
nb->dev = dev;
|
||||
|
|
|
|||
|
|
@ -33,9 +33,7 @@ void x25_init_timers(struct sock *sk)
|
|||
{
|
||||
struct x25_sock *x25 = x25_sk(sk);
|
||||
|
||||
init_timer(&x25->timer);
|
||||
x25->timer.data = (unsigned long)sk;
|
||||
x25->timer.function = &x25_timer_expiry;
|
||||
setup_timer(&x25->timer, x25_timer_expiry, (unsigned long)sk);
|
||||
|
||||
/* initialized by sock_init_data */
|
||||
sk->sk_timer.data = (unsigned long)sk;
|
||||
|
|
|
|||
Loading…
Reference in a new issue