summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Masney <masneyb@onstation.org>2016-10-10 03:19:58 -0400
committerJonathan Cameron <jic23@kernel.org>2016-10-23 19:33:42 +0100
commitaba1a8d77fe355d1b698e10b97c74974ca8b7438 (patch)
treee1c1eba4775921ecce130d0ba03a458ce61ff3f1
parent19a00a9d4c9027b4ce93b7c500da53dcb36ba1b0 (diff)
downloadlinux-aba1a8d77fe355d1b698e10b97c74974ca8b7438.tar.gz
linux-aba1a8d77fe355d1b698e10b97c74974ca8b7438.tar.bz2
linux-aba1a8d77fe355d1b698e10b97c74974ca8b7438.zip
staging: iio: isl29018: combine two return statements into one
Use the return value from isl29018_set_integration_time() as the return value for isl29018_chip_init() since this is the last piece of work inside that function. Signed-off-by: Brian Masney <masneyb@onstation.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/staging/iio/light/isl29018.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 132de8e93bf8..6b6c761c801d 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -616,12 +616,10 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
status = isl29018_set_integration_time(chip,
isl29018_int_utimes[chip->type][chip->int_time]);
- if (status < 0) {
+ if (status < 0)
dev_err(dev, "Init of isl29018 fails\n");
- return status;
- }
- return 0;
+ return status;
}
static const struct iio_info isl29018_info = {