summaryrefslogtreecommitdiff
path: root/board/strago
diff options
context:
space:
mode:
authorAlec Berg <alecaberg@chromium.org>2015-07-10 14:05:54 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-07-14 22:39:36 +0000
commitac1cba419ab507163dcb6dc9d6be1401f3f1f518 (patch)
tree3bf00ed663cfb4fd5033bd954f343ef938250ce6 /board/strago
parent7015336ea81aa1d57b62088a792d1c13cbc25d57 (diff)
downloadchrome-ec-ac1cba419ab507163dcb6dc9d6be1401f3f1f518.tar.gz
cleanup: remove board_discharge_on_ac() unless custom func needed
Remove duplicate board_discharge_on_ac() functions and create CONFIG_CHARGER_DISCHARGE_ON_AC_CUSTOM for boards that have a unique implementation of board_discharge_on_ac(). BUG=chrome-os-partner:42294 BRANCH=none TEST=make -j buildall. load on samus and test 'ectool chargecontrol discharge' forces discharging on AC, and 'ectool chargecontrol normal' resumes normal charging. Change-Id: I2b7c04b9278d07748d6d41798ceab1a7e90684e4 Signed-off-by: Alec Berg <alecaberg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/284911 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'board/strago')
-rw-r--r--board/strago/board.c5
-rw-r--r--board/strago/board.h3
-rw-r--r--board/strago/led.c2
3 files changed, 1 insertions, 9 deletions
diff --git a/board/strago/board.c b/board/strago/board.c
index a18dd7ed78..05c9761ac1 100644
--- a/board/strago/board.c
+++ b/board/strago/board.c
@@ -99,11 +99,6 @@ struct ec_thermal_config thermal_params[] = {
};
BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-int board_discharge_on_ac(int enable)
-{
- return charger_discharge_on_ac(enable);
-}
-
/* Four Motion sensors */
/* kxcj9 mutex and local/private data*/
static struct mutex g_kxcj9_mutex[2];
diff --git a/board/strago/board.h b/board/strago/board.h
index 1629fb929f..07f48d9cc4 100644
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -129,9 +129,6 @@ enum als_id {
ALS_COUNT,
};
-/* Discharge battery when on AC power for factory test. */
-int board_discharge_on_ac(int enable);
-
#endif /* !__ASSEMBLER__ */
#endif /* __CROS_EC_BOARD_H */
diff --git a/board/strago/led.c b/board/strago/led.c
index 1ecaf3d3f2..aacf18706d 100644
--- a/board/strago/led.c
+++ b/board/strago/led.c
@@ -187,7 +187,7 @@ static int command_led_color(int argc, char **argv)
} else if (!strcasecmp(argv[1], "amber")) {
set_color(LED_AMBER);
} else {
- /* maybe handle board_discharge_on_ac() too? */
+ /* maybe handle charger_discharge_on_ac() too? */
return EC_ERROR_PARAM1;
}
}