patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

usbc: improve error handling in the ucpd_stm32 and vbus_adc

Browse source 
As noted in PR#63165 checking of result should use comparison to
success value instead of checking if result is negative. It will
allow to check if function returned invalid but positive value.

Signed-off-by: Michał Barnaś <mb@semihalf.com>
This commit is contained in:
Michał Barnaś 2023-09-29 16:27:47 +02:00 committed by Carles Cufí
parent 3848e4c023
commit 5246cea800
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/usb_c/tcpc/ucpd_stm32.c
View file

@ -1366,7 +1366,7 @@ static int ucpd_init(const struct device *dev)
LOG_DBG("Pinctrl signals configuration");
ret = pinctrl_apply_state(config->ucpd_pcfg, PINCTRL_STATE_DEFAULT);
if (ret < 0) {
if (ret != 0) {
LOG_ERR("USB pinctrl setup failed (%d)", ret);
return ret;
}

18
drivers/usb_c/vbus/usbc_vbus_adc.c
View file

@ -146,13 +146,12 @@ static int adc_vbus_init(const struct device *dev)
/* Configure VBUS Measurement enable pin if defined */
if (gcp->port) {
ret = device_is_ready(gcp->port);
if (ret < 0) {
if (!device_is_ready(gcp->port)) {
LOG_ERR("%s: device not ready", gcp->port->name);
return ret;
return -EIO;
}
ret = gpio_pin_configure_dt(gcp, GPIO_OUTPUT_INACTIVE);
if (ret < 0) {
if (ret != 0) {
LOG_ERR("Failed to control feed %s.%u: %d",
gcp->port->name, gcp->pin, ret);
return ret;
@ -161,13 +160,12 @@ static int adc_vbus_init(const struct device *dev)
/* Configure VBUS Discharge pin if defined */
if (gcd->port) {
ret = device_is_ready(gcd->port);
if (ret == false) {
if (!device_is_ready(gcd->port)) {
LOG_ERR("%s: device not ready", gcd->port->name);
return ret;
return -EIO;
}
ret = gpio_pin_configure_dt(gcd, GPIO_OUTPUT_INACTIVE);
if (ret < 0) {
if (ret != 0) {
LOG_ERR("Failed to control feed %s.%u: %d",
gcd->port->name, gcd->pin, ret);
return ret;
@ -179,13 +177,13 @@ static int adc_vbus_init(const struct device *dev)
data->sequence.buffer_size = sizeof(data->sample);
ret = adc_channel_setup_dt(&config->adc_channel);
if (ret < 0) {
if (ret != 0) {
LOG_INF("Could not setup channel (%d)\n", ret);
return ret;
}
ret = adc_sequence_init_dt(&config->adc_channel, &data->sequence);
if (ret < 0) {
if (ret != 0) {
LOG_INF("Could not init sequence (%d)\n", ret);
return ret;
}