summaryrefslogtreecommitdiff
path: root/power
diff options
context:
space:
mode:
authorJonathan Brandmeyer <jbrandmeyer@chromium.org>2018-06-01 13:14:26 -0600
committerchrome-bot <chrome-bot@chromium.org>2018-06-04 17:23:44 -0700
commitee1861e9ed39707136b3ff13f5bb007b8a9c2796 (patch)
tree4732b7e83c1359c87da52dc922bca59545981480 /power
parenteee7778fcfc5e555d119cff65caa7c045343e356 (diff)
downloadchrome-ec-ee1861e9ed39707136b3ff13f5bb007b8a9c2796.tar.gz
stoney: strip unused forcing_coldreset path.
This is just a dead code elimination; no functional changes. See also b/72426192 for functional changes. BUG=b:77301519 TEST=power cycle on grunt EVT BRANCH=none Change-Id: Id9f60d14eb2a7df9013f779b05a54638ad62971f Signed-off-by: Jonathan Brandmeyer <jbrandmeyer@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1083317 Reviewed-by: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'power')
-rw-r--r--power/stoney.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/power/stoney.c b/power/stoney.c
index fcc3ddcf73..ebbfa85698 100644
--- a/power/stoney.c
+++ b/power/stoney.c
@@ -24,12 +24,11 @@
/* Console output macros */
#define CPUTS(outstr) cputs(CC_CHIPSET, outstr)
-#define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ##args)
#define IN_S5_PGOOD POWER_SIGNAL_MASK(X86_S5_PGOOD)
-static int forcing_coldreset; /* Forced coldreset in progress? */
-static int forcing_shutdown; /* Forced shutdown in progress? */
+static int forcing_shutdown; /* Forced shutdown in progress? */
void chipset_force_shutdown(void)
{
@@ -151,8 +150,6 @@ enum power_state power_handle_state(enum power_state state)
case POWER_G3S5:
/* Exit SOC G3 */
- /* Platform is powering up, clear forcing_coldreset */
- forcing_coldreset = 0;
#ifndef BOARD_KAHLEE
/* Enable system power ("*_A" rails) in S5. */
@@ -265,13 +262,6 @@ enum power_state power_handle_state(enum power_state state)
return POWER_S5;
case POWER_S5G3:
-
- /* Power up the platform again for forced cold reset */
- if (forcing_coldreset) {
- forcing_coldreset = 0;
- return POWER_G3S5;
- }
-
chipset_force_g3();
return POWER_G3;