diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2019-03-11 15:57:52 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-26 04:42:55 -0700 |
| commit | bb266fc26fc05d4ab22de6ad7bce5b477c9f9140 (patch) | |
| tree | f6ada087f62246c3a9547e649ac8846b0ed6d5ab /driver/battery | |
| parent | 0bfc511527cf2aebfa163c63a1d028419ca0b0c3 (diff) | |
| download | chrome-ec-bb266fc26fc05d4ab22de6ad7bce5b477c9f9140.tar.gz | |
common: replace 1 << digits, with BIT(digits)
Requested for linux integration, use BIT instead of 1 <<
First step replace bit operation with operand containing only digits.
Fix an error in motion_lid try to set bit 31 of a signed integer.
BUG=None
BRANCH=None
TEST=compile
Change-Id: Ie843611f2f68e241f0f40d4067f7ade726951d29
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1518659
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'driver/battery')
| -rw-r--r-- | driver/battery/bq27541.c | 2 | ||||
| -rw-r--r-- | driver/battery/max17055.h | 32 | ||||
| -rw-r--r-- | driver/battery/mm8013.h | 12 |
3 files changed, 23 insertions, 23 deletions
diff --git a/driver/battery/bq27541.c b/driver/battery/bq27541.c index 760a367b9c..2731b908bf 100644 --- a/driver/battery/bq27541.c +++ b/driver/battery/bq27541.c @@ -312,7 +312,7 @@ enum battery_disconnect_state battery_get_disconnect_state(void) rv = bq27541_read(REG_PROTECTOR, &val); if (rv) return BATTERY_DISCONNECT_ERROR; - if (!(val & (1 << 6))) { + if (!(val & BIT(6))) { not_disconnected = 1; return BATTERY_NOT_DISCONNECTED; } diff --git a/driver/battery/max17055.h b/driver/battery/max17055.h index f223fa15e8..ba18af56d5 100644 --- a/driver/battery/max17055.h +++ b/driver/battery/max17055.h @@ -55,16 +55,16 @@ #define REG_MODELCFG 0xdb /* Status reg (0x00) flags */ -#define STATUS_POR (1 << 1) -#define STATUS_IMN (1 << 2) -#define STATUS_BST (1 << 3) -#define STATUS_IMX (1 << 6) -#define STATUS_VMN (1 << 8) -#define STATUS_TMN (1 << 9) -#define STATUS_SMN (1 << 10) -#define STATUS_VMX (1 << 12) -#define STATUS_TMX (1 << 13) -#define STATUS_SMX (1 << 14) +#define STATUS_POR BIT(1) +#define STATUS_IMN BIT(2) +#define STATUS_BST BIT(3) +#define STATUS_IMX BIT(6) +#define STATUS_VMN BIT(8) +#define STATUS_TMN BIT(9) +#define STATUS_SMN BIT(10) +#define STATUS_VMX BIT(12) +#define STATUS_TMX BIT(13) +#define STATUS_SMX BIT(14) #define STATUS_ALL_ALRT \ (STATUS_IMN | STATUS_IMX | STATUS_VMN | STATUS_VMX | STATUS_TMN | \ STATUS_TMX | STATUS_SMN | STATUS_SMX) @@ -76,12 +76,12 @@ #define IALRT_DISABLE 0x7f80 /* Config reg (0x1d) flags */ -#define CONF_AEN (1 << 2) -#define CONF_IS (1 << 11) -#define CONF_VS (1 << 12) -#define CONF_TS (1 << 13) -#define CONF_SS (1 << 14) -#define CONF_TSEL (1 << 15) +#define CONF_AEN BIT(2) +#define CONF_IS BIT(11) +#define CONF_VS BIT(12) +#define CONF_TS BIT(13) +#define CONF_SS BIT(14) +#define CONF_TSEL BIT(15) #define CONF_ALL_STICKY (CONF_IS | CONF_VS | CONF_TS | CONF_SS) /* FStat reg (0x3d) flags */ diff --git a/driver/battery/mm8013.h b/driver/battery/mm8013.h index 1915c81832..4dedfbd4a3 100644 --- a/driver/battery/mm8013.h +++ b/driver/battery/mm8013.h @@ -24,17 +24,17 @@ #define REG_PRODUCT_INFORMATION 0x64 /* Over Temperature in charge */ -#define MM8013_FLAG_OTC (1 << 15) +#define MM8013_FLAG_OTC BIT(15) /* Over Temperature in discharge */ -#define MM8013_FLAG_OTD (1 << 14) +#define MM8013_FLAG_OTD BIT(14) /* Over-charge */ -#define MM8013_FLAG_BATHI (1 << 13) +#define MM8013_FLAG_BATHI BIT(13) /* Full Charge */ -#define MM8013_FLAG_FC (1 << 9) +#define MM8013_FLAG_FC BIT(9) /* Charge allowed */ -#define MM8013_FLAG_CHG (1 << 8) +#define MM8013_FLAG_CHG BIT(8) /* Discharge */ -#define MM8013_FLAG_DSG (1 << 0) +#define MM8013_FLAG_DSG BIT(0) #endif /* __CROS_EC_MM8013_H */ |