net: ax25: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Joerg Reuter <jreuter@yaina.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-hams@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 20 insertions, 21 deletions

diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c
index 23a6f38a80bf..c47b7ee1e4da 100644
--- a/net/ax25/ax25_timer.c
+++ b/net/ax25/ax25_timer.c
@@ -33,20 +33,19 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 
-static void ax25_heartbeat_expiry(unsigned long);
-static void ax25_t1timer_expiry(unsigned long);
-static void ax25_t2timer_expiry(unsigned long);
-static void ax25_t3timer_expiry(unsigned long);
-static void ax25_idletimer_expiry(unsigned long);
+static void ax25_heartbeat_expiry(struct timer_list *);
+static void ax25_t1timer_expiry(struct timer_list *);
+static void ax25_t2timer_expiry(struct timer_list *);
+static void ax25_t3timer_expiry(struct timer_list *);
+static void ax25_idletimer_expiry(struct timer_list *);
 
 void ax25_setup_timers(ax25_cb *ax25)
 {
-        setup_timer(&ax25->timer, ax25_heartbeat_expiry, (unsigned long)ax25);
-        setup_timer(&ax25->t1timer, ax25_t1timer_expiry, (unsigned long)ax25);
-        setup_timer(&ax25->t2timer, ax25_t2timer_expiry, (unsigned long)ax25);
-        setup_timer(&ax25->t3timer, ax25_t3timer_expiry, (unsigned long)ax25);
-        setup_timer(&ax25->idletimer, ax25_idletimer_expiry,
-                    (unsigned long)ax25);
+        timer_setup(&ax25->timer, ax25_heartbeat_expiry, 0);
+        timer_setup(&ax25->t1timer, ax25_t1timer_expiry, 0);
+        timer_setup(&ax25->t2timer, ax25_t2timer_expiry, 0);
+        timer_setup(&ax25->t3timer, ax25_t3timer_expiry, 0);
+        timer_setup(&ax25->idletimer, ax25_idletimer_expiry, 0);
 }
 
 void ax25_start_heartbeat(ax25_cb *ax25)
@@ -120,10 +119,10 @@ unsigned long ax25_display_timer(struct timer_list *timer)
 
 EXPORT_SYMBOL(ax25_display_timer);
 
-static void ax25_heartbeat_expiry(unsigned long param)
+static void ax25_heartbeat_expiry(struct timer_list *t)
 {
         int proto = AX25_PROTO_STD_SIMPLEX;
-        ax25_cb *ax25 = (ax25_cb *)param;
+        ax25_cb *ax25 = from_timer(ax25, t, timer);
 
         if (ax25->ax25_dev)
                 proto = ax25->ax25_dev->values[AX25_VALUES_PROTOCOL];
@@ -145,9 +144,9 @@ static void ax25_heartbeat_expiry(unsigned long param)
         }
 }
 
-static void ax25_t1timer_expiry(unsigned long param)
+static void ax25_t1timer_expiry(struct timer_list *t)
 {
-        ax25_cb *ax25 = (ax25_cb *)param;
+        ax25_cb *ax25 = from_timer(ax25, t, t1timer);
 
         switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
         case AX25_PROTO_STD_SIMPLEX:
@@ -164,9 +163,9 @@ static void ax25_t1timer_expiry(unsigned long param)
         }
 }
 
-static void ax25_t2timer_expiry(unsigned long param)
+static void ax25_t2timer_expiry(struct timer_list *t)
 {
-        ax25_cb *ax25 = (ax25_cb *)param;
+        ax25_cb *ax25 = from_timer(ax25, t, t2timer);
 
         switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
         case AX25_PROTO_STD_SIMPLEX:
@@ -183,9 +182,9 @@ static void ax25_t2timer_expiry(unsigned long param)
         }
 }
 
-static void ax25_t3timer_expiry(unsigned long param)
+static void ax25_t3timer_expiry(struct timer_list *t)
 {
-        ax25_cb *ax25 = (ax25_cb *)param;
+        ax25_cb *ax25 = from_timer(ax25, t, t3timer);
 
         switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
         case AX25_PROTO_STD_SIMPLEX:
@@ -204,9 +203,9 @@ static void ax25_t3timer_expiry(unsigned long param)
         }
 }
 
-static void ax25_idletimer_expiry(unsigned long param)
+static void ax25_idletimer_expiry(struct timer_list *t)
 {
-        ax25_cb *ax25 = (ax25_cb *)param;
+        ax25_cb *ax25 = from_timer(ax25, t, idletimer);
 
         switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
         case AX25_PROTO_STD_SIMPLEX: