michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: adxl372: add missing error handling

Browse source 
Error handling was missing in numerous places, mostly for GPIO related
callbacks. An assertion has been used in the context of thread callback.

Fixes #38132

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2021-08-30 20:44:34 +02:00 • committed by Anas Nashif
commit 35e7acb703
1 changed files with 33 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

44
drivers/sensor/adxl372/adxl372_trigger.c
View file

@ -21,6 +21,7 @@ static void adxl372_thread_cb(const struct device *dev)
const struct adxl372_dev_config *cfg = dev->config; const struct adxl372_dev_config *cfg = dev->config;
struct adxl372_data *drv_data = dev->data; struct adxl372_data *drv_data = dev->data;
uint8_t status1, status2; uint8_t status1, status2;
int ret;
/* Clear the status */ /* Clear the status */
if (adxl372_get_status(dev, &status1, &status2, NULL) < 0) { if (adxl372_get_status(dev, &status1, &status2, NULL) < 0) {
@ -46,7 +47,9 @@ static void adxl372_thread_cb(const struct device *dev)
drv_data->drdy_handler(dev, &drv_data->drdy_trigger); drv_data->drdy_handler(dev, &drv_data->drdy_trigger);
} }
gpio_pin_interrupt_configure_dt(&cfg->interrupt, GPIO_INT_EDGE_TO_ACTIVE); ret = gpio_pin_interrupt_configure_dt(&cfg->interrupt,
GPIO_INT_EDGE_TO_ACTIVE);
__ASSERT(ret == 0, "Interrupt configuration failed");
} }
static void adxl372_gpio_callback(const struct device *dev, static void adxl372_gpio_callback(const struct device *dev,
@ -93,7 +96,11 @@ int adxl372_trigger_set(const struct device *dev,
uint8_t int_mask, int_en, status1, status2; uint8_t int_mask, int_en, status1, status2;
int ret; int ret;
gpio_pin_interrupt_configure_dt(&cfg->interrupt, GPIO_INT_DISABLE); ret = gpio_pin_interrupt_configure_dt(&cfg->interrupt,
GPIO_INT_DISABLE);
if (ret < 0) {
return ret;
}
switch (trig->type) { switch (trig->type) {
case SENSOR_TRIG_THRESHOLD: case SENSOR_TRIG_THRESHOLD:
@ -109,8 +116,7 @@ int adxl372_trigger_set(const struct device *dev,
break; break;
default: default:
LOG_ERR("Unsupported sensor trigger"); LOG_ERR("Unsupported sensor trigger");
ret = -ENOTSUP; return -ENOTSUP;
goto out;
} }
if (handler) { if (handler) {
@ -120,34 +126,50 @@ int adxl372_trigger_set(const struct device *dev,
} }
ret = adxl372_reg_write_mask(dev, ADXL372_INT1_MAP, int_mask, int_en); ret = adxl372_reg_write_mask(dev, ADXL372_INT1_MAP, int_mask, int_en);
if (ret < 0) {
return ret;
}
adxl372_get_status(dev, &status1, &status2, NULL); /* Clear status */ ret = adxl372_get_status(dev, &status1, &status2, NULL); /* Clear status */
out: if (ret < 0) {
gpio_pin_interrupt_configure_dt(&cfg->interrupt, GPIO_INT_EDGE_TO_ACTIVE); return ret;
}
return ret; ret = gpio_pin_interrupt_configure_dt(&cfg->interrupt,
GPIO_INT_EDGE_TO_ACTIVE);
if (ret < 0) {
return ret;
}
return 0;
} }
int adxl372_init_interrupt(const struct device *dev) int adxl372_init_interrupt(const struct device *dev)
{ {
const struct adxl372_dev_config *cfg = dev->config; const struct adxl372_dev_config *cfg = dev->config;
struct adxl372_data *drv_data = dev->data; struct adxl372_data *drv_data = dev->data;
int ret;
if (!device_is_ready(cfg->interrupt.port)) { if (!device_is_ready(cfg->interrupt.port)) {
LOG_ERR("GPIO port %s not ready", cfg->interrupt.port->name); LOG_ERR("GPIO port %s not ready", cfg->interrupt.port->name);
return -EINVAL; return -EINVAL;
} }
gpio_pin_configure_dt(&cfg->interrupt, GPIO_INPUT); ret = gpio_pin_configure_dt(&cfg->interrupt, GPIO_INPUT);
if (ret < 0) {
return ret;
}
gpio_init_callback(&drv_data->gpio_cb, gpio_init_callback(&drv_data->gpio_cb,
adxl372_gpio_callback, adxl372_gpio_callback,
BIT(cfg->interrupt.pin)); BIT(cfg->interrupt.pin));
if (gpio_add_callback(cfg->interrupt.port, &drv_data->gpio_cb) < 0) { ret = gpio_add_callback(cfg->interrupt.port, &drv_data->gpio_cb);
if (ret < 0) {
LOG_ERR("Failed to set gpio callback!"); LOG_ERR("Failed to set gpio callback!");
return -EIO; return ret;
} }
drv_data->dev = dev; drv_data->dev = dev;
#if defined(CONFIG_ADXL372_TRIGGER_OWN_THREAD) #if defined(CONFIG_ADXL372_TRIGGER_OWN_THREAD)