summaryrefslogtreecommitdiff
path: root/board/nami/battery.c
diff options
context:
space:
mode:
Diffstat (limited to 'board/nami/battery.c')
-rw-r--r--board/nami/battery.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/board/nami/battery.c b/board/nami/battery.c
index 149272c8c1..18f03fc9de 100644
--- a/board/nami/battery.c
+++ b/board/nami/battery.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
@@ -16,8 +16,8 @@
#include "hooks.h"
#include "util.h"
-#define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ## args)
-#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
+#define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ##args)
+#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ##args)
/* Default, Nami, Vayne */
static const struct battery_info info_0 = {
@@ -243,8 +243,9 @@ static int battery_init(void)
if (batt_status & STATUS_INITIALIZED)
return 1;
- return battery_status(&batt_status) ? 0 :
- !!(batt_status & STATUS_INITIALIZED);
+ return battery_status(&batt_status) ?
+ 0 :
+ !!(batt_status & STATUS_INITIALIZED);
}
enum battery_disconnect_grace_period {
@@ -278,13 +279,13 @@ static int battery_check_disconnect_ti_bq40z50(void)
uint8_t data[6];
/* Check if battery charging + discharging is disabled. */
- rv = sb_read_mfgacc(PARAM_OPERATION_STATUS,
- SB_ALT_MANUFACTURER_ACCESS, data, sizeof(data));
+ rv = sb_read_mfgacc(PARAM_OPERATION_STATUS, SB_ALT_MANUFACTURER_ACCESS,
+ data, sizeof(data));
if (rv)
return BATTERY_DISCONNECT_ERROR;
- if ((data[3] & (BATTERY_DISCHARGING_DISABLED |
- BATTERY_CHARGING_DISABLED)) ==
+ if ((data[3] &
+ (BATTERY_DISCHARGING_DISABLED | BATTERY_CHARGING_DISABLED)) ==
(BATTERY_DISCHARGING_DISABLED | BATTERY_CHARGING_DISABLED)) {
if (oem != PROJECT_SONA)
return BATTERY_DISCONNECTED;
@@ -298,10 +299,10 @@ static int battery_check_disconnect_ti_bq40z50(void)
* stop charging and avoid damaging the battery.
*/
if (disconnect_grace_period ==
- BATTERY_DISCONNECT_GRACE_PERIOD_OVER)
+ BATTERY_DISCONNECT_GRACE_PERIOD_OVER)
return BATTERY_DISCONNECTED;
if (disconnect_grace_period ==
- BATTERY_DISCONNECT_GRACE_PERIOD_OFF)
+ BATTERY_DISCONNECT_GRACE_PERIOD_OFF)
hook_call_deferred(&battery_disconnect_timer_data,
5 * SECOND);
ccprintf("Battery disconnect grace period\n");