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.

David Howells committed 19 years ago

Commit 6bb49e51 parent 52bad643 files · +10 −9Browse files

Unified · Split

3 files

drivers/block/floppy.c +2 −2
include/linux/workqueue.h +5 −4
kernel/workqueue.c +3 −3

drivers/block/floppy.c+2−2

@@ -996,7 +996,7 @@ static DECLARE_WORK(floppy_work, NULL, NULL); · 995 unmodified lines
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,7 +1008,7 @@ static void cancel_activity(void) · 5 unmodified lines
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	}

include/linux/workqueue.h+5−4

@@ -11,10 +11,12 @@ · 10 unmodified lines
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	};
@@ -91,7 +93,7 @@ extern int FASTCALL(schedule_work(struct work_struct *work)); · 70 unmodified lines
91	93	extern int FASTCALL(schedule_delayed_work(struct delayed_work *work, unsigned long delay));
92	94
93	95	extern int schedule_delayed_work_on(int cpu, struct delayed_work *work, unsigned long delay);
94		−extern int schedule_on_each_cpu(void (func)(void info), void *info);
	96	+extern int schedule_on_each_cpu(work_func_t func, void *info);
95	97	extern void flush_scheduled_work(void);
96	98	extern int current_is_keventd(void);
97	99	extern int keventd_up(void);
@@ -100,8 +102,7 @@ extern void init_workqueues(void); · 2 unmodified lines
100	102	void cancel_rearming_delayed_work(struct delayed_work *work);
101	103	void cancel_rearming_delayed_workqueue(struct workqueue_struct *,
102	104	struct delayed_work *);
103		−int execute_in_process_context(void (fn)(void ), void *,
104		− struct execute_work *);
	105	+int execute_in_process_context(work_func_t fn, void , struct execute_work );
105	106
106	107	/*
107	108	* Kill off a pending schedule_delayed_work(). Note that the work callback

kernel/workqueue.c+3−3

@@ -217,7 +217,7 @@ static void run_workqueue(struct cpu_workqueue_struct *cwq) · 216 unmodified lines
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,7 +513,7 @@ EXPORT_SYMBOL(schedule_delayed_work_on); · 289 unmodified lines
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,7 +578,7 @@ EXPORT_SYMBOL(cancel_rearming_delayed_work); · 58 unmodified lines
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()) {