]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: iio: adc: ad7192: Report error directly in ad7192_setup
authorMircea Caprioru <mircea.caprioru@analog.com>
Fri, 15 Mar 2019 11:14:25 +0000 (13:14 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Thu, 4 Apr 2019 19:20:00 +0000 (20:20 +0100)
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>
drivers/staging/iio/adc/ad7192.c

index 0733b43b635aabefda0f75fbd33aa7eed8da256e..5c54ce380fa5eedabeee81a99f335a541cc2a6e4 100644 (file)
@@ -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