summaryrefslogtreecommitdiff
path: root/common/hooks.c
diff options
context:
space:
mode:
authorAnton Staaf <robotboy@chromium.org>2016-03-23 12:45:28 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-04-18 17:32:40 -0700
commit068cd0850684ee28a5a514e5a270edce2edb3979 (patch)
treee84f2316e37baa72f1c9611e665749d91a3ce8fd /common/hooks.c
parent1e7c280491232110e1006d545f9a61ca05d469d5 (diff)
downloadchrome-ec-068cd0850684ee28a5a514e5a270edce2edb3979.tar.gz
Deferred: Use deferred_data instead of function pointer
Previously calls to hook_call_deferred were passed the function to call, which was then looked up in the .rodata.deferred section with a linear search. This linear search can be replaced with a subtract by passing the pointer to the deferred_data object created when DECLARE_DEFERRED was invoked. Signed-off-by: Anton Staaf <robotboy@chromium.org> BRANCH=None BUG=None CQ-DEPEND=CL:*255812 TEST=make buildall -j Change-Id: I951dd1541302875b102dd086154cf05591694440 Reviewed-on: https://chromium-review.googlesource.com/334315 Commit-Ready: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'common/hooks.c')
-rw-r--r--common/hooks.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/common/hooks.c b/common/hooks.c
index f8e368c36d..1a1a1aa819 100644
--- a/common/hooks.c
+++ b/common/hooks.c
@@ -132,21 +132,13 @@ void hook_notify(enum hook_type type)
#endif
}
-int hook_call_deferred(void (*routine)(void), int us)
+int hook_call_deferred(const struct deferred_data *data, int us)
{
- const struct deferred_data *p;
- int i;
+ int i = data - __deferred_funcs;
- /* Find the index of the routine */
- for (p = __deferred_funcs; p < __deferred_funcs_end; p++) {
- if (p->routine == routine)
- break;
- }
- if (p >= __deferred_funcs_end)
+ if (data < __deferred_funcs || data >= __deferred_funcs_end)
return EC_ERROR_INVAL; /* Routine not registered */
- i = p - __deferred_funcs;
-
if (us == -1) {
/* Cancel */
defer_until[i] = 0;