summaryrefslogtreecommitdiff
path: root/include/charge_state.h
diff options
context:
space:
mode:
authorSam Hurst <shurst@google.com>2017-02-01 09:20:22 -0800
committerchrome-bot <chrome-bot@chromium.org>2017-02-06 14:50:32 -0800
commitedf46467b9519478885375b393fadcdbdd90dde4 (patch)
treeea18c2e91481fb255352dd2a89e56b848cf4c6a5 /include/charge_state.h
parent2e0df8b6c66c2150dbac853a1abe67d41e46acf9 (diff)
downloadchrome-ec-edf46467b9519478885375b393fadcdbdd90dde4.tar.gz
cleanup: Remove charge_state_v1
All boards have been transitioned to charge_state_v2.c So charge_state_v1.c, HOOK_CHARGE_STATE_CHANGE, and CONFIG_CHARGER_TIMEOUT_HOURS can be removed BUG=chrome-os-partner:36272 TEST=make -j buildall BRANCH=none Change-Id: I3f20c5198ea75185f9894deb792575a1be31432a Reviewed-on: https://chromium-review.googlesource.com/435467 Commit-Ready: Sam Hurst <shurst@google.com> Tested-by: Sam Hurst <shurst@google.com> Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'include/charge_state.h')
-rw-r--r--include/charge_state.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/charge_state.h b/include/charge_state.h
index a1e476209d..63c2df136e 100644
--- a/include/charge_state.h
+++ b/include/charge_state.h
@@ -120,17 +120,9 @@ int charge_get_battery_temp(int idx, int *temp_ptr);
const struct batt_params *charger_current_battery_params(void);
-/* Pick the right implementation */
-#ifdef CONFIG_CHARGER_V1
-#ifdef CONFIG_CHARGER_V2
-#error "Choose either CONFIG_CHARGER_V1 or CONFIG_CHARGER_V2, not both"
-#else
-#include "charge_state_v1.h"
-#endif
-#else /* not V1 */
+/* Config Charger */
#ifdef CONFIG_CHARGER_V2
#include "charge_state_v2.h"
-#endif
-#endif /* CONFIG_CHARGER_V1 */
+#endif /* CONFIG_CHARGER_V2 */
#endif /* __CROS_EC_CHARGE_STATE_H */