From 75dddb1f5dbd4adedb4ca0b2d9d167659b5313e7 Mon Sep 17 00:00:00 2001 From: Fernando Guzman Lugo Date: Thu, 29 Sep 2011 20:54:50 -0500 Subject: remoteproc: combine all the block notify head structures into one Previously there was 1 block notify head per each type of event that remoteproc could generate. That also causes that the users need one block notify per each event they register for. Now, everything is combined into one notify block head, with this change users will register a callback function which will receive all type of remoteproc events, so it is responsibility of the users to check for the events they really want. Change-Id: I206b85536429310a593f5aac6175c110022fb1ff Signed-off-by: Fernando Guzman Lugo --- include/linux/remoteproc.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'include/linux/remoteproc.h') diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 9249a13..29cfe1c 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -266,15 +266,12 @@ struct rproc { int cdump_len0, cdump_len1; struct completion firmware_loading_complete; struct work_struct error_work; - struct blocking_notifier_head nb_error; + struct blocking_notifier_head nbh; struct completion error_comp; #ifdef CONFIG_REMOTE_PROC_AUTOSUSPEND unsigned sus_timeout; bool force_suspend; bool need_resume; - struct blocking_notifier_head nb_presus; - struct blocking_notifier_head nb_possus; - struct blocking_notifier_head nb_resume; struct mutex pm_lock; #endif struct pm_qos_request_list *qos_request; @@ -288,8 +285,8 @@ struct rproc { int rproc_set_secure(const char *, bool); struct rproc *rproc_get(const char *); void rproc_put(struct rproc *); -int rproc_event_register(struct rproc *, struct notifier_block *, int); -int rproc_event_unregister(struct rproc *, struct notifier_block *, int); +int rproc_event_register(struct rproc *, struct notifier_block *); +int rproc_event_unregister(struct rproc *, struct notifier_block *); int rproc_register(struct device *, const char *, const struct rproc_ops *, const char *, struct rproc_mem_pool *, struct module *, unsigned int timeout); -- cgit v1.1