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 /chip/mec1322/gpio.c | |
| 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 'chip/mec1322/gpio.c')
| -rw-r--r-- | chip/mec1322/gpio.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/chip/mec1322/gpio.c b/chip/mec1322/gpio.c index 4df46dd6d8..c3b62ad583 100644 --- a/chip/mec1322/gpio.c +++ b/chip/mec1322/gpio.c @@ -37,7 +37,7 @@ void gpio_set_alternate_function(uint32_t port, uint32_t mask, int func) while (mask) { i = __builtin_ffs(mask) - 1; val = MEC1322_GPIO_CTL(port, i); - val &= ~((1 << 12) | (1 << 13)); + val &= ~(BIT(12) | BIT(13)); /* mux_control = 0 indicates GPIO */ if (func > 0) val |= (func & 0x3) << 12; @@ -57,7 +57,7 @@ test_mockable int gpio_get_level(enum gpio_signal signal) i = GPIO_MASK_TO_NUM(mask); val = MEC1322_GPIO_CTL(gpio_list[signal].port, i); - return (val & (1 << 24)) ? 1 : 0; + return (val & BIT(24)) ? 1 : 0; } void gpio_set_level(enum gpio_signal signal, int value) @@ -70,9 +70,9 @@ void gpio_set_level(enum gpio_signal signal, int value) i = GPIO_MASK_TO_NUM(mask); if (value) - MEC1322_GPIO_CTL(gpio_list[signal].port, i) |= (1 << 16); + MEC1322_GPIO_CTL(gpio_list[signal].port, i) |= BIT(16); else - MEC1322_GPIO_CTL(gpio_list[signal].port, i) &= ~(1 << 16); + MEC1322_GPIO_CTL(gpio_list[signal].port, i) &= ~BIT(16); } void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags) @@ -89,16 +89,16 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags) * when changing the line to an output. */ if (flags & GPIO_OPEN_DRAIN) - val |= (1 << 8); + val |= BIT(8); else - val &= ~(1 << 8); + val &= ~BIT(8); if (flags & GPIO_OUTPUT) { - val |= (1 << 9); - val &= ~(1 << 10); + val |= BIT(9); + val &= ~BIT(10); } else { - val &= ~(1 << 9); - val |= (1 << 10); + val &= ~BIT(9); + val |= BIT(10); } /* Handle pullup / pulldown */ @@ -111,9 +111,9 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags) /* Set up interrupt */ if (flags & (GPIO_INT_F_RISING | GPIO_INT_F_FALLING)) - val |= (1 << 7); + val |= BIT(7); else - val &= ~(1 << 7); + val &= ~BIT(7); val &= ~(0x7 << 4); @@ -130,9 +130,9 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags) /* Set up level */ if (flags & GPIO_HIGH) - val |= (1 << 16); + val |= BIT(16); else if (flags & GPIO_LOW) - val &= ~(1 << 16); + val &= ~BIT(16); MEC1322_GPIO_CTL(port, i) = val; } |