1 files changed, 3 insertions, 4 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index a5361fc6215d..c77fdf6bf24f 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1492,9 +1492,9 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
 }
 EXPORT_SYMBOL(queue_work_on);
 
-void delayed_work_timer_fn(unsigned long __data)
+void delayed_work_timer_fn(struct timer_list *t)
 {
-        struct delayed_work *dwork = (struct delayed_work *)__data;
+        struct delayed_work *dwork = from_timer(dwork, t, timer);
 
         /* should have been called from irqsafe timer with irq already off */
         __queue_work(dwork->cpu, dwork->wq, &dwork->work);
@@ -1508,8 +1508,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
         struct work_struct *work = &dwork->work;
 
         WARN_ON_ONCE(!wq);
-        WARN_ON_ONCE(timer->function != delayed_work_timer_fn ||
-                     timer->data != (unsigned long)dwork);
+        WARN_ON_ONCE(timer->function != (TIMER_FUNC_TYPE)delayed_work_timer_fn);
         WARN_ON_ONCE(timer_pending(timer));
         WARN_ON_ONCE(!list_empty(&work->entry));