Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue update from Tejun Heo:
 "One trivial patch to use setup_deferrable_timer() instead of
  open-coding the initialization"

* 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: use setup_deferrable_timer

1 files changed, 2 insertions, 3 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index c0168b7da1ea..bbf46da28e9a 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3209,9 +3209,8 @@ static int init_worker_pool(struct worker_pool *pool)
         INIT_LIST_HEAD(&pool->idle_list);
         hash_init(pool->busy_hash);
 
-        init_timer_deferrable(&pool->idle_timer);
-        pool->idle_timer.function = idle_worker_timeout;
-        pool->idle_timer.data = (unsigned long)pool;
+        setup_deferrable_timer(&pool->idle_timer, idle_worker_timeout,
+                               (unsigned long)pool);
 
         setup_timer(&pool->mayday_timer, pool_mayday_timeout,
                     (unsigned long)pool);