workqueue: Convert timers to use timer_setup() (part 2)

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. (The prior workqueue patch missed a few timers.)

Kees Cook committed 9 years ago

Commit 32a6c721 parent c310ce41 file · +6 −8Browse files

Showing the changes to kernel/workqueue.c (1 of 1 file). Show all

Unified · Split

kernel/workqueue.c+6−8

 	wake_up_process(worker->task);
 }
-static void idle_worker_timeout(unsigned long __pool)
+static void idle_worker_timeout(struct timer_list *t)
 {
-	struct worker_pool *pool = (void *)__pool;
+	struct worker_pool *pool = from_timer(pool, t, idle_timer);
 	spin_lock_irq(&pool->lock);
 	}
 }
-static void pool_mayday_timeout(unsigned long __pool)
+static void pool_mayday_timeout(struct timer_list *t)
 {
-	struct worker_pool *pool = (void *)__pool;
+	struct worker_pool *pool = from_timer(pool, t, mayday_timer);
 	struct work_struct *work;
 	spin_lock_irq(&pool->lock);
 	INIT_LIST_HEAD(&pool->idle_list);
 	hash_init(pool->busy_hash);
-	setup_deferrable_timer(&pool->idle_timer, idle_worker_timeout,
+	timer_setup(&pool->idle_timer, idle_worker_timeout, TIMER_DEFERRABLE);
-			       (unsigned long)pool);
-	setup_timer(&pool->mayday_timer, pool_mayday_timeout,
+	timer_setup(&pool->mayday_timer, pool_mayday_timeout, 0);
-		    (unsigned long)pool);
 	mutex_init(&pool->manager_arb);
 	mutex_init(&pool->attach_mutex);