Commit 362f2b09 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Tejun Heo

async: rename and redefine async_func_ptr

A function type is typically defined as
typedef ret_type (*func)(args..)

but async_func_ptr is not.  Redefine it.

Also rename async_func_ptr to async_func_t for _func_t suffix is more generic.
Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
parent cc2a8b1a
...@@ -35,7 +35,7 @@ static unsigned int nr_ports; ...@@ -35,7 +35,7 @@ static unsigned int nr_ports;
static struct sh7786_pcie_hwops { static struct sh7786_pcie_hwops {
int (*core_init)(void); int (*core_init)(void);
async_func_ptr *port_init_hw; async_func_t port_init_hw;
} *sh7786_pcie_hwops; } *sh7786_pcie_hwops;
static struct resource sh7786_pci0_resources[] = { static struct resource sh7786_pci0_resources[] = {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/list.h> #include <linux/list.h>
typedef u64 async_cookie_t; typedef u64 async_cookie_t;
typedef void (async_func_ptr) (void *data, async_cookie_t cookie); typedef void (*async_func_t) (void *data, async_cookie_t cookie);
struct async_domain { struct async_domain {
struct list_head pending; struct list_head pending;
unsigned registered:1; unsigned registered:1;
...@@ -37,8 +37,8 @@ struct async_domain { ...@@ -37,8 +37,8 @@ struct async_domain {
struct async_domain _name = { .pending = LIST_HEAD_INIT(_name.pending), \ struct async_domain _name = { .pending = LIST_HEAD_INIT(_name.pending), \
.registered = 0 } .registered = 0 }
extern async_cookie_t async_schedule(async_func_ptr *ptr, void *data); extern async_cookie_t async_schedule(async_func_t func, void *data);
extern async_cookie_t async_schedule_domain(async_func_ptr *ptr, void *data, extern async_cookie_t async_schedule_domain(async_func_t func, void *data,
struct async_domain *domain); struct async_domain *domain);
void async_unregister_domain(struct async_domain *domain); void async_unregister_domain(struct async_domain *domain);
extern void async_synchronize_full(void); extern void async_synchronize_full(void);
......
...@@ -73,7 +73,7 @@ struct async_entry { ...@@ -73,7 +73,7 @@ struct async_entry {
struct list_head global_list; struct list_head global_list;
struct work_struct work; struct work_struct work;
async_cookie_t cookie; async_cookie_t cookie;
async_func_ptr *func; async_func_t func;
void *data; void *data;
struct async_domain *domain; struct async_domain *domain;
}; };
...@@ -145,7 +145,7 @@ static void async_run_entry_fn(struct work_struct *work) ...@@ -145,7 +145,7 @@ static void async_run_entry_fn(struct work_struct *work)
wake_up(&async_done); wake_up(&async_done);
} }
static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct async_domain *domain) static async_cookie_t __async_schedule(async_func_t func, void *data, struct async_domain *domain)
{ {
struct async_entry *entry; struct async_entry *entry;
unsigned long flags; unsigned long flags;
...@@ -165,13 +165,13 @@ static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct a ...@@ -165,13 +165,13 @@ static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct a
spin_unlock_irqrestore(&async_lock, flags); spin_unlock_irqrestore(&async_lock, flags);
/* low on memory.. run synchronously */ /* low on memory.. run synchronously */
ptr(data, newcookie); func(data, newcookie);
return newcookie; return newcookie;
} }
INIT_LIST_HEAD(&entry->domain_list); INIT_LIST_HEAD(&entry->domain_list);
INIT_LIST_HEAD(&entry->global_list); INIT_LIST_HEAD(&entry->global_list);
INIT_WORK(&entry->work, async_run_entry_fn); INIT_WORK(&entry->work, async_run_entry_fn);
entry->func = ptr; entry->func = func;
entry->data = data; entry->data = data;
entry->domain = domain; entry->domain = domain;
...@@ -198,21 +198,21 @@ static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct a ...@@ -198,21 +198,21 @@ static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct a
/** /**
* async_schedule - schedule a function for asynchronous execution * async_schedule - schedule a function for asynchronous execution
* @ptr: function to execute asynchronously * @func: function to execute asynchronously
* @data: data pointer to pass to the function * @data: data pointer to pass to the function
* *
* Returns an async_cookie_t that may be used for checkpointing later. * Returns an async_cookie_t that may be used for checkpointing later.
* Note: This function may be called from atomic or non-atomic contexts. * Note: This function may be called from atomic or non-atomic contexts.
*/ */
async_cookie_t async_schedule(async_func_ptr *ptr, void *data) async_cookie_t async_schedule(async_func_t func, void *data)
{ {
return __async_schedule(ptr, data, &async_dfl_domain); return __async_schedule(func, data, &async_dfl_domain);
} }
EXPORT_SYMBOL_GPL(async_schedule); EXPORT_SYMBOL_GPL(async_schedule);
/** /**
* async_schedule_domain - schedule a function for asynchronous execution within a certain domain * async_schedule_domain - schedule a function for asynchronous execution within a certain domain
* @ptr: function to execute asynchronously * @func: function to execute asynchronously
* @data: data pointer to pass to the function * @data: data pointer to pass to the function
* @domain: the domain * @domain: the domain
* *
...@@ -222,10 +222,10 @@ EXPORT_SYMBOL_GPL(async_schedule); ...@@ -222,10 +222,10 @@ EXPORT_SYMBOL_GPL(async_schedule);
* synchronization domain is specified via @domain. Note: This function * synchronization domain is specified via @domain. Note: This function
* may be called from atomic or non-atomic contexts. * may be called from atomic or non-atomic contexts.
*/ */
async_cookie_t async_schedule_domain(async_func_ptr *ptr, void *data, async_cookie_t async_schedule_domain(async_func_t func, void *data,
struct async_domain *domain) struct async_domain *domain)
{ {
return __async_schedule(ptr, data, domain); return __async_schedule(func, data, domain);
} }
EXPORT_SYMBOL_GPL(async_schedule_domain); EXPORT_SYMBOL_GPL(async_schedule_domain);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment