Browse Source

input: pinnacle: fix return value check for WAIT_FOR

WAIT_FOR returns type in this case is a boolean, use a boolean as
variable and check.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
pull/75137/head
Fabio Baltieri 1 year ago committed by Anas Nashif
parent
commit
96815be5f7
  1. 25
      drivers/input/input_pinnacle.c

25
drivers/input/input_pinnacle.c

@ -256,14 +256,14 @@ static inline int pinnacle_clear_cmd_complete(const struct device *dev)
static int pinnacle_era_wait_for_completion(const struct device *dev) static int pinnacle_era_wait_for_completion(const struct device *dev)
{ {
int rc; bool ret;
uint8_t value; uint8_t value;
rc = WAIT_FOR(!pinnacle_read(dev, PINNACLE_REG_ERA_CTRL, &value) && ret = WAIT_FOR(pinnacle_read(dev, PINNACLE_REG_ERA_CTRL, &value) == 0 &&
value == PINNACLE_ERA_CTRL_COMPLETE, value == PINNACLE_ERA_CTRL_COMPLETE,
PINNACLE_ERA_AWAIT_RETRY_COUNT * PINNACLE_ERA_AWAIT_DELAY_POLL_US, PINNACLE_ERA_AWAIT_RETRY_COUNT * PINNACLE_ERA_AWAIT_DELAY_POLL_US,
k_sleep(K_USEC(PINNACLE_ERA_AWAIT_DELAY_POLL_US))); k_sleep(K_USEC(PINNACLE_ERA_AWAIT_DELAY_POLL_US)));
if (rc < 0) { if (!ret) {
return -EIO; return -EIO;
} }
@ -743,6 +743,7 @@ static int pinnacle_init(const struct device *dev)
const struct pinnacle_config *config = dev->config; const struct pinnacle_config *config = dev->config;
int rc; int rc;
bool ret;
uint8_t value; uint8_t value;
if (!pinnacle_bus_is_ready(dev)) { if (!pinnacle_bus_is_ready(dev)) {
@ -761,12 +762,12 @@ static int pinnacle_init(const struct device *dev)
} }
/* Wait until the calibration is completed (SW_CC is asserted) */ /* Wait until the calibration is completed (SW_CC is asserted) */
rc = WAIT_FOR(!pinnacle_read(dev, PINNACLE_REG_STATUS1, &value) && ret = WAIT_FOR(pinnacle_read(dev, PINNACLE_REG_STATUS1, &value) == 0 &&
(value & PINNACLE_STATUS1_SW_CC) == PINNACLE_STATUS1_SW_CC, (value & PINNACLE_STATUS1_SW_CC) == PINNACLE_STATUS1_SW_CC,
PINNACLE_CALIBRATION_AWAIT_RETRY_COUNT * PINNACLE_CALIBRATION_AWAIT_RETRY_COUNT *
PINNACLE_CALIBRATION_AWAIT_DELAY_POLL_US, PINNACLE_CALIBRATION_AWAIT_DELAY_POLL_US,
k_sleep(K_USEC(PINNACLE_CALIBRATION_AWAIT_DELAY_POLL_US))); k_sleep(K_USEC(PINNACLE_CALIBRATION_AWAIT_DELAY_POLL_US)));
if (rc < 0) { if (!ret) {
LOG_ERR("Failed to wait for calibration complition"); LOG_ERR("Failed to wait for calibration complition");
return -EIO; return -EIO;
} }

Loading…
Cancel
Save