From c9ed433d24c2807a33a25ed42ec57526063ac127 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 26 Mar 2018 02:07:57 +0300 Subject: power: Avoid interaction build errors Change-Id: I77942f23a9c617abac1a8533cfc1fd7bfa7f66e8 --- power-845.c | 3 --- power-common.c | 3 --- power-msmnile.c | 3 +-- utils.h | 1 + 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/power-845.c b/power-845.c index 621a882..b081915 100644 --- a/power-845.c +++ b/power-845.c @@ -183,9 +183,6 @@ static int process_video_encode_hint(void* metadata) { return HINT_NONE; } -/* Declare function before use */ -void interaction(int duration, int num_args, int opt_list[]); - int power_hint_override(power_hint_t hint, void* data) { int ret_val = HINT_NONE; switch (hint) { diff --git a/power-common.c b/power-common.c index 6719158..2e5b8c8 100644 --- a/power-common.c +++ b/power-common.c @@ -64,9 +64,6 @@ int __attribute__((weak)) power_hint_override(power_hint_t UNUSED(hint), void* U return HINT_NONE; } -/* Declare function before use */ -void interaction(int duration, int num_args, int opt_list[]); - void power_hint(power_hint_t hint, void* data) { /* Check if this hint has been overridden. */ if (power_hint_override(hint, data) == HINT_HANDLED) { diff --git a/power-msmnile.c b/power-msmnile.c index 3c22138..85f04a9 100644 --- a/power-msmnile.c +++ b/power-msmnile.c @@ -43,6 +43,7 @@ #include #include "power-common.h" +#include "utils.h" static int display_fd; #define SYS_DISPLAY_PWR "/sys/kernel/hbtp/display_pwr" @@ -85,8 +86,6 @@ int set_interactive_override(int on) { return HINT_HANDLED; } -void interaction(int duration, int num_args, int opt_list[]); - int power_hint_override(power_hint_t hint, void* data) { int ret_val = HINT_NONE; switch (hint) { diff --git a/utils.h b/utils.h index 28c59de..ef22b7c 100644 --- a/utils.h +++ b/utils.h @@ -40,5 +40,6 @@ void perform_hint_action(int hint_id, int resource_values[], int num_resources); void undo_hint_action(int hint_id); void undo_initial_hint_action(); void release_request(int lock_handle); +void interaction(int duration, int num_args, int opt_list[]); int interaction_with_handle(int lock_handle, int duration, int num_args, int opt_list[]); int perf_hint_enable(int hint_id, int duration); -- cgit v1.2.3