summaryrefslogtreecommitdiff
path: root/power
diff options
context:
space:
mode:
authorJack Rosenthal <jrosenth@chromium.org>2021-01-07 10:33:36 -0700
committerCommit Bot <commit-bot@chromium.org>2021-01-07 18:34:21 +0000
commit3ea3beefdab9a4e9cfdc83f28b6e32fbacc5078a (patch)
treeb3a9d66d6c953f99f32597cd35be0729b6404f51 /power
parent6603d0f730ee3b0c9ed80e9cc43b89b20dab91ef (diff)
downloadchrome-ec-3ea3beefdab9a4e9cfdc83f28b6e32fbacc5078a.tar.gz
zephyr: remove guard to call of lpc_s3_resume_clear_masks
This function is shimmed now, we can take away the guard. BUG=b:172678200 BRANCH=none TEST=power on volteer Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Change-Id: I7589b3485930e8d40966e9e71434b98648018872 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2615130 Commit-Queue: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'power')
-rw-r--r--power/intel_x86.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/power/intel_x86.c b/power/intel_x86.c
index 6c0cd6a920..c4aae9db81 100644
--- a/power/intel_x86.c
+++ b/power/intel_x86.c
@@ -388,12 +388,7 @@ enum power_state common_intel_x86_power_handle_state(enum power_state state)
/* Enable wireless */
wireless_set_state(WIRELESS_ON);
- /*
- * TODO(b/172678200): this function hasn't been
- * shimmed to Zephyr yet
- */
- if (!IS_ENABLED(CONFIG_ZEPHYR))
- lpc_s3_resume_clear_masks();
+ lpc_s3_resume_clear_masks();
/* Call hooks now that rails are up */
hook_notify(HOOK_CHIPSET_RESUME);