summaryrefslogtreecommitdiff
path: root/drivers/staging/iio
diff options
context:
space:
mode:
authorMircea Caprioru <mircea.caprioru@analog.com>2019-03-15 13:14:25 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2019-04-04 20:20:00 +0100
commit753a9870e04166ac49384aa71f91591cd8f6aa24 (patch)
treec2694660dee93c5d38f86f4f72b5b1603c7c831a /drivers/staging/iio
parent3ad7a939c931e8f97fe1eecdbb964c76a90eadcd (diff)
staging: iio: adc: ad7192: Report error directly in ad7192_setup
This patch removes the goto out statement and uninformative print message. This improves readability. Signed-off-by: Mircea Caprioru <mircea.caprioru@analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r--drivers/staging/iio/adc/ad7192.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 0733b43b635a..5c54ce380fa5 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -260,13 +260,13 @@ static int ad7192_setup(struct ad7192_state *st,
/* reset the serial interface */
ret = ad_sd_reset(&st->sd, 48);
if (ret < 0)
- goto out;
+ return ret;
usleep_range(500, 1000); /* Wait for at least 500us */
/* write/read test for device presence */
ret = ad_sd_read_reg(&st->sd, AD7192_REG_ID, 1, &id);
if (ret)
- goto out;
+ return ret;
id &= AD7192_ID_MASK;
@@ -314,15 +314,15 @@ static int ad7192_setup(struct ad7192_state *st,
ret = ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, st->mode);
if (ret)
- goto out;
+ return ret;
ret = ad_sd_write_reg(&st->sd, AD7192_REG_CONF, 3, st->conf);
if (ret)
- goto out;
+ return ret;
ret = ad7192_calibrate_all(st);
if (ret)
- goto out;
+ return ret;
/* Populate available ADC input ranges */
for (i = 0; i < ARRAY_SIZE(st->scale_avail); i++) {
@@ -336,9 +336,6 @@ static int ad7192_setup(struct ad7192_state *st,
}
return 0;
-out:
- dev_err(&st->sd.spi->dev, "setup failed\n");
- return ret;
}
static ssize_t