github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iio: adc: ad7191: Don't check for specific errors when parsing properties

Browse Source 
Instead of checking for the specific error codes (that can be considered
a layering violation to some extent) check for the property existence first
and then either parse it, or apply a default value.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Andy Shevchenko 2026-02-19 15:39:36 +01:00 committed by Jonathan Cameron
parent 45c45b3f83
commit 5c2290c054
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/iio/adc/ad7191.c
View File

@ -154,27 +154,18 @@ static int ad7191_config_setup(struct iio_dev *indio_dev)
const u32 gain[4] = { 1, 8, 64, 128 };
static u32 scale_buffer[4][2];
int odr_value, odr_index = 0, pga_value, pga_index = 0, i, ret;
const char *propname;
u64 scale_uv;
st->samp_freq_index = 0;
st->scale_index = 0;
ret = device_property_read_u32(dev, "adi,odr-value", &odr_value);
if (ret && ret != -EINVAL)
return dev_err_probe(dev, ret, "Failed to get odr value.\n");
propname = "adi,odr-value";
if (device_property_present(dev, propname)) {
ret = device_property_read_u32(dev, propname, &odr_value);
if (ret)
return dev_err_probe(dev, ret, "Failed to get %s.\n", propname);
if (ret == -EINVAL) {
st->odr_gpios = devm_gpiod_get_array(dev, "odr", GPIOD_OUT_LOW);
if (IS_ERR(st->odr_gpios))
return dev_err_probe(dev, PTR_ERR(st->odr_gpios),
"Failed to get odr gpios.\n");
if (st->odr_gpios->ndescs != 2)
return dev_err_probe(dev, -EINVAL, "Expected 2 odr gpio pins.\n");
st->samp_freq_avail = samp_freq;
st->samp_freq_avail_size = ARRAY_SIZE(samp_freq);
} else {
for (i = 0; i < ARRAY_SIZE(samp_freq); i++) {
if (odr_value != samp_freq[i])
continue;
@ -186,6 +177,17 @@ static int ad7191_config_setup(struct iio_dev *indio_dev)
st->samp_freq_avail_size = 1;
st->odr_gpios = NULL;
} else {
st->odr_gpios = devm_gpiod_get_array(dev, "odr", GPIOD_OUT_LOW);
if (IS_ERR(st->odr_gpios))
return dev_err_probe(dev, PTR_ERR(st->odr_gpios),
"Failed to get odr gpios.\n");
if (st->odr_gpios->ndescs != 2)
return dev_err_probe(dev, -EINVAL, "Expected 2 odr gpio pins.\n");
st->samp_freq_avail = samp_freq;
st->samp_freq_avail_size = ARRAY_SIZE(samp_freq);
}
mutex_lock(&st->lock);
@ -200,22 +202,12 @@ static int ad7191_config_setup(struct iio_dev *indio_dev)
mutex_unlock(&st->lock);
ret = device_property_read_u32(dev, "adi,pga-value", &pga_value);
if (ret && ret != -EINVAL)
return dev_err_probe(dev, ret, "Failed to get pga value.\n");
propname = "adi,pga-value";
if (device_property_present(dev, propname)) {
ret = device_property_read_u32(dev, propname, &pga_value);
if (ret)
return dev_err_probe(dev, ret, "Failed to get %s.\n", propname);
if (ret == -EINVAL) {
st->pga_gpios = devm_gpiod_get_array(dev, "pga", GPIOD_OUT_LOW);
if (IS_ERR(st->pga_gpios))
return dev_err_probe(dev, PTR_ERR(st->pga_gpios),
"Failed to get pga gpios.\n");
if (st->pga_gpios->ndescs != 2)
return dev_err_probe(dev, -EINVAL, "Expected 2 pga gpio pins.\n");
st->scale_avail = scale_buffer;
st->scale_avail_size = ARRAY_SIZE(scale_buffer);
} else {
for (i = 0; i < ARRAY_SIZE(gain); i++) {
if (pga_value != gain[i])
continue;
@ -227,6 +219,17 @@ static int ad7191_config_setup(struct iio_dev *indio_dev)
st->scale_avail_size = 1;
st->pga_gpios = NULL;
} else {
st->pga_gpios = devm_gpiod_get_array(dev, "pga", GPIOD_OUT_LOW);
if (IS_ERR(st->pga_gpios))
return dev_err_probe(dev, PTR_ERR(st->pga_gpios),
"Failed to get pga gpios.\n");
if (st->pga_gpios->ndescs != 2)
return dev_err_probe(dev, -EINVAL, "Expected 2 pga gpio pins.\n");
st->scale_avail = scale_buffer;
st->scale_avail_size = ARRAY_SIZE(scale_buffer);
}
st->temp_gpio = devm_gpiod_get(dev, "temp", GPIOD_OUT_LOW);