Merge tag 'for-linus-timers-conversion-final-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/urgent

Pull the last batch of manual timer conversions from Kees Cook:

 - final batch of "non trivial" timer conversions (multi-tree dependencies,
   things Coccinelle couldn't handle, etc).

 - treewide conversions via Coccinelle, in 4 steps:
   - DEFINE_TIMER() functions converted to struct timer_list * argument
   - init_timer() -> setup_timer()
   - setup_timer() -> timer_setup()
   - setup_timer() -> timer_setup() (with a single embedded structure)

 - deprecated timer API removals (init_timer(), setup_*timer())

 - finalization of new API (remove global casts)

1 files changed, 8 insertions, 10 deletions

diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c
index 1a5535bc3b8d..5d4ae01951b5 100644
--- a/net/lapb/lapb_timer.c
+++ b/net/lapb/lapb_timer.c
@@ -35,15 +35,14 @@
 #include <linux/interrupt.h>
 #include <net/lapb.h>
 
-static void lapb_t1timer_expiry(unsigned long);
-static void lapb_t2timer_expiry(unsigned long);
+static void lapb_t1timer_expiry(struct timer_list *);
+static void lapb_t2timer_expiry(struct timer_list *);
 
 void lapb_start_t1timer(struct lapb_cb *lapb)
 {
         del_timer(&lapb->t1timer);
 
-        lapb->t1timer.data     = (unsigned long)lapb;
-        lapb->t1timer.function = &lapb_t1timer_expiry;
+        lapb->t1timer.function = lapb_t1timer_expiry;
         lapb->t1timer.expires  = jiffies + lapb->t1;
 
         add_timer(&lapb->t1timer);
@@ -53,8 +52,7 @@ void lapb_start_t2timer(struct lapb_cb *lapb)
 {
         del_timer(&lapb->t2timer);
 
-        lapb->t2timer.data     = (unsigned long)lapb;
-        lapb->t2timer.function = &lapb_t2timer_expiry;
+        lapb->t2timer.function = lapb_t2timer_expiry;
         lapb->t2timer.expires  = jiffies + lapb->t2;
 
         add_timer(&lapb->t2timer);
@@ -75,9 +73,9 @@ int lapb_t1timer_running(struct lapb_cb *lapb)
         return timer_pending(&lapb->t1timer);
 }
 
-static void lapb_t2timer_expiry(unsigned long param)
+static void lapb_t2timer_expiry(struct timer_list *t)
 {
-        struct lapb_cb *lapb = (struct lapb_cb *)param;
+        struct lapb_cb *lapb = from_timer(lapb, t, t2timer);
 
         if (lapb->condition & LAPB_ACK_PENDING_CONDITION) {
                 lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
@@ -85,9 +83,9 @@ static void lapb_t2timer_expiry(unsigned long param)
         }
 }
 
-static void lapb_t1timer_expiry(unsigned long param)
+static void lapb_t1timer_expiry(struct timer_list *t)
 {
-        struct lapb_cb *lapb = (struct lapb_cb *)param;
+        struct lapb_cb *lapb = from_timer(lapb, t, t1timer);
 
         switch (lapb->state) {