[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>

2 files changed, 6 insertions, 12 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index e8c347579da9..c0720e4659bc 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -366,9 +366,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
         in6_dev_hold(ndev);
 
 #ifdef CONFIG_IPV6_PRIVACY
-        init_timer(&ndev->regen_timer);
-        ndev->regen_timer.function = ipv6_regen_rndid;
-        ndev->regen_timer.data = (unsigned long) ndev;
+        setup_timer(&ndev->regen_timer, ipv6_regen_rndid, (unsigned long)ndev);
         if ((dev->flags&IFF_LOOPBACK) ||
             dev->type == ARPHRD_TUNNEL ||
 #if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 331d728c2035..17d7318ff7bf 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -903,9 +903,7 @@ int ipv6_dev_mc_inc(struct net_device *dev, struct in6_addr *addr)
                 return -ENOMEM;
         }
 
-        init_timer(&mc->mca_timer);
-        mc->mca_timer.function = igmp6_timer_handler;
-        mc->mca_timer.data = (unsigned long) mc;
+        setup_timer(&mc->mca_timer, igmp6_timer_handler, (unsigned long)mc);
 
         ipv6_addr_copy(&mc->mca_addr, addr);
         mc->idev = idev;
@@ -2259,14 +2257,12 @@ void ipv6_mc_init_dev(struct inet6_dev *idev)
         write_lock_bh(&idev->lock);
         rwlock_init(&idev->mc_lock);
         idev->mc_gq_running = 0;
-        init_timer(&idev->mc_gq_timer);
-        idev->mc_gq_timer.data = (unsigned long) idev;
-        idev->mc_gq_timer.function = &mld_gq_timer_expire;
+        setup_timer(&idev->mc_gq_timer, mld_gq_timer_expire,
+                        (unsigned long)idev);
         idev->mc_tomb = NULL;
         idev->mc_ifc_count = 0;
-        init_timer(&idev->mc_ifc_timer);
-        idev->mc_ifc_timer.data = (unsigned long) idev;
-        idev->mc_ifc_timer.function = &mld_ifc_timer_expire;
+        setup_timer(&idev->mc_ifc_timer, mld_ifc_timer_expire,
+                        (unsigned long)idev);
         idev->mc_qrv = MLD_QRV_DEFAULT;
         idev->mc_maxdelay = IGMP6_UNSOLICITED_IVAL;
         idev->mc_v1_seen = 0;