With all callbacks converted, and the timer callback prototype switched over, the TIMER_FUNC_TYPE cast is no longer needed, so remove it. Conversion was done with the following scripts: perl -pi -e 's|\(TIMER_FUNC_TYPE\)||g' \ $(git grep TIMER_FUNC_TYPE | cut -d: -f1 | sort -u) perl -pi -e 's|\(TIMER_DATA_TYPE\)||g' \ $(git grep TIMER_DATA_TYPE | cut -d: -f1 | sort -u) The now unused macros are also dropped from include/linux/timer.h.
Showing the changes to kernel/workqueue.c (1 of 44 files). Show all
Unified · Split
| @@ -1509,7 +1509,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, · 1508 unmodified lines | |||
| 1509 | struct work_struct *work = &dwork->work; | 1509 | struct work_struct *work = &dwork->work; |
| 1510 | 1510 | ||
| 1511 | WARN_ON_ONCE(!wq); | 1511 | WARN_ON_ONCE(!wq); |
| 1512 | WARN_ON_ONCE(timer->function != (TIMER_FUNC_TYPE)delayed_work_timer_fn); | 1512 | WARN_ON_ONCE(timer->function != delayed_work_timer_fn); |
| 1513 | WARN_ON_ONCE(timer_pending(timer)); | 1513 | WARN_ON_ONCE(timer_pending(timer)); |
| 1514 | WARN_ON_ONCE(!list_empty(&work->entry)); | 1514 | WARN_ON_ONCE(!list_empty(&work->entry)); |
| 1515 | 1515 | ||