Define a type for the work function prototype. It's not only kept in the work_struct struct, it's also passed as an argument to several functions. This makes it easier to change it.
Showing the changes to kernel/workqueue.c (1 of 3 files). Show all
Unified · Split
| @@ -217,7 +217,7 @@ static void run_workqueue(struct cpu_workqueue_struct *cwq) · 216 unmodified lines | |||
| 217 | while (!list_empty(&cwq->worklist)) { | 217 | while (!list_empty(&cwq->worklist)) { |
| 218 | struct work_struct *work = list_entry(cwq->worklist.next, | 218 | struct work_struct *work = list_entry(cwq->worklist.next, |
| 219 | struct work_struct, entry); | 219 | struct work_struct, entry); |
| 220 | void (*f) (void *) = work->func; | 220 | work_func_t f = work->func; |
| 221 | void *data = work->data; | 221 | void *data = work->data; |
| 222 | 222 | ||
| 223 | list_del_init(cwq->worklist.next); | 223 | list_del_init(cwq->worklist.next); |
| @@ -513,7 +513,7 @@ EXPORT_SYMBOL(schedule_delayed_work_on); · 289 unmodified lines | |||
| 513 | * | 513 | * |
| 514 | * schedule_on_each_cpu() is very slow. | 514 | * schedule_on_each_cpu() is very slow. |
| 515 | */ | 515 | */ |
| 516 | int schedule_on_each_cpu(void (*func)(void *info), void *info) | 516 | int schedule_on_each_cpu(work_func_t func, void *info) |
| 517 | { | 517 | { |
| 518 | int cpu; | 518 | int cpu; |
| 519 | struct work_struct *works; | 519 | struct work_struct *works; |
| @@ -578,7 +578,7 @@ EXPORT_SYMBOL(cancel_rearming_delayed_work); · 58 unmodified lines | |||
| 578 | * Returns: 0 - function was executed | 578 | * Returns: 0 - function was executed |
| 579 | * 1 - function was scheduled for execution | 579 | * 1 - function was scheduled for execution |
| 580 | */ | 580 | */ |
| 581 | int execute_in_process_context(void (*fn)(void *data), void *data, | 581 | int execute_in_process_context(work_func_t fn, void *data, |
| 582 | struct execute_work *ew) | 582 | struct execute_work *ew) |
| 583 | { | 583 | { |
| 584 | if (!in_interrupt()) { | 584 | if (!in_interrupt()) { |