Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

WorkStruct: Typedef the work function prototype

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.

Signed-Off-By: David Howells <dhowells@redhat.com>

+10 -9
+2 -2
drivers/block/floppy.c
··· 996 996 997 997 static void schedule_bh(void (*handler) (void)) 998 998 { 999 - PREPARE_WORK(&floppy_work, (void (*)(void *))handler, NULL); 999 + PREPARE_WORK(&floppy_work, (work_func_t)handler, NULL); 1000 1000 schedule_work(&floppy_work); 1001 1001 } 1002 1002 ··· 1008 1008 1009 1009 spin_lock_irqsave(&floppy_lock, flags); 1010 1010 do_floppy = NULL; 1011 - PREPARE_WORK(&floppy_work, (void *)empty, NULL); 1011 + PREPARE_WORK(&floppy_work, (work_func_t)empty, NULL); 1012 1012 del_timer(&fd_timer); 1013 1013 spin_unlock_irqrestore(&floppy_lock, flags); 1014 1014 }
+5 -4
include/linux/workqueue.h
··· 11 11 12 12 struct workqueue_struct; 13 13 14 + typedef void (*work_func_t)(void *data); 15 + 14 16 struct work_struct { 15 17 unsigned long pending; 16 18 struct list_head entry; 17 - void (*func)(void *); 19 + work_func_t func; 18 20 void *data; 19 21 void *wq_data; 20 22 }; ··· 93 91 extern int FASTCALL(schedule_delayed_work(struct delayed_work *work, unsigned long delay)); 94 92 95 93 extern int schedule_delayed_work_on(int cpu, struct delayed_work *work, unsigned long delay); 96 - extern int schedule_on_each_cpu(void (*func)(void *info), void *info); 94 + extern int schedule_on_each_cpu(work_func_t func, void *info); 97 95 extern void flush_scheduled_work(void); 98 96 extern int current_is_keventd(void); 99 97 extern int keventd_up(void); ··· 102 100 void cancel_rearming_delayed_work(struct delayed_work *work); 103 101 void cancel_rearming_delayed_workqueue(struct workqueue_struct *, 104 102 struct delayed_work *); 105 - int execute_in_process_context(void (*fn)(void *), void *, 106 - struct execute_work *); 103 + int execute_in_process_context(work_func_t fn, void *, struct execute_work *); 107 104 108 105 /* 109 106 * Kill off a pending schedule_delayed_work(). Note that the work callback
+3 -3
kernel/workqueue.c
··· 217 217 while (!list_empty(&cwq->worklist)) { 218 218 struct work_struct *work = list_entry(cwq->worklist.next, 219 219 struct work_struct, entry); 220 - void (*f) (void *) = work->func; 220 + work_func_t f = work->func; 221 221 void *data = work->data; 222 222 223 223 list_del_init(cwq->worklist.next); ··· 513 513 * 514 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 518 int cpu; 519 519 struct work_struct *works; ··· 578 578 * Returns: 0 - function was executed 579 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 582 struct execute_work *ew) 583 583 { 584 584 if (!in_interrupt()) {