From 352276235ca18404a42ca01b75de3fdc7951e271 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 30 Oct 2017 20:08:48 -0700 Subject: [PATCH] power: Get rid of power_board_handle_host_sleep_event power_board_handle_host_sleep_event was added to allow boards like poppy to enable/disable PMIC VR decay only once during S0ix entry/exit. Now that the chipset hooks have been fixed, there is no need of this board specific callback. If in the future, there is a need to have such a callback, this change can be reverted. BUG=None BRANCH=None TEST=make -j buildall Change-Id: I1d60e43da6c0d462132593efa26bc52312b81786 Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/745982 Reviewed-by: Aaron Durbin --- include/power.h | 8 -------- power/intel_x86.c | 12 +----------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/include/power.h b/include/power.h index 271b8add69..a39b757078 100644 --- a/include/power.h +++ b/include/power.h @@ -192,14 +192,6 @@ enum host_sleep_event power_get_host_sleep_state(void); */ void power_chipset_handle_host_sleep_event(enum host_sleep_event state); -/** - * Provide callback to allow board to take any action on host sleep event - * command. - * - * @param state Current host sleep state updated by the host. - */ -void power_board_handle_host_sleep_event(enum host_sleep_event state); - /* * This is the default state of host sleep event. Calls to * power_reset_host_sleep_state will set host sleep event to this diff --git a/power/intel_x86.c b/power/intel_x86.c index 8a841161e3..46cfb13df8 100644 --- a/power/intel_x86.c +++ b/power/intel_x86.c @@ -473,19 +473,10 @@ void common_intel_x86_handle_rsmrst(enum power_state state) CPRINTS("Pass through GPIO_RSMRST_L_PGOOD: %d", rsmrst_in); } -#ifdef CONFIG_POWER_TRACK_HOST_SLEEP_STATE - -void __attribute__((weak)) -power_board_handle_host_sleep_event(enum host_sleep_event state) -{ - /* Default weak implementation -- no action required. */ -} +#if defined(CONFIG_POWER_TRACK_HOST_SLEEP_STATE) && defined(CONFIG_POWER_S0IX) void power_chipset_handle_host_sleep_event(enum host_sleep_event state) { - power_board_handle_host_sleep_event(state); - -#ifdef CONFIG_POWER_S0IX if (state == HOST_SLEEP_EVENT_S0IX_SUSPEND) { /* * Indicate to power state machine that a new host event for @@ -508,7 +499,6 @@ void power_chipset_handle_host_sleep_event(enum host_sleep_event state) } else if (state == HOST_SLEEP_EVENT_DEFAULT_RESET) { power_signal_disable_interrupt(sleep_sig[SYS_SLEEP_S0IX]); } -#endif } #endif