From: Brian Masney <masneyb@onstation.org>
Date: Mon, 10 Oct 2016 07:19:58 +0000 (-0400)
Subject: staging: iio: isl29018: combine two return statements into one
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aba1a8d77fe355d1b698e10b97c74974ca8b7438;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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 = {