From bb266fc26fc05d4ab22de6ad7bce5b477c9f9140 Mon Sep 17 00:00:00 2001 From: Gwendal Grignou Date: Mon, 11 Mar 2019 15:57:52 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/1518659 Reviewed-by: Daisuke Nojiri --- chip/mchp/gpio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chip/mchp/gpio.c') diff --git a/chip/mchp/gpio.c b/chip/mchp/gpio.c index 282c643a95..aa95b8fb0d 100644 --- a/chip/mchp/gpio.c +++ b/chip/mchp/gpio.c @@ -57,7 +57,7 @@ void gpio_set_alternate_function(uint32_t port, uint32_t mask, int func) while (mask) { i = __builtin_ffs(mask) - 1; val = MCHP_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; @@ -77,7 +77,7 @@ test_mockable int gpio_get_level(enum gpio_signal signal) i = GPIO_MASK_TO_NUM(mask); val = MCHP_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) @@ -90,9 +90,9 @@ void gpio_set_level(enum gpio_signal signal, int value) i = GPIO_MASK_TO_NUM(mask); if (value) - MCHP_GPIO_CTL(gpio_list[signal].port, i) |= (1 << 16); + MCHP_GPIO_CTL(gpio_list[signal].port, i) |= BIT(16); else - MCHP_GPIO_CTL(gpio_list[signal].port, i) &= ~(1 << 16); + MCHP_GPIO_CTL(gpio_list[signal].port, i) &= ~BIT(16); } /* -- cgit v1.2.1