[PATCH 13/19] staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling()

Path	csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Brian Masney <masneyb@onstation.org>
Newsgroups	linux.kernel
Subject	[PATCH 13/19] staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling()
Date	Sun, 04 Dec 2016 03:30:01 +0100
Message-ID	<sKuIV-194-17@gated-at.bofh.it> (permalink)
References	<sKuIV-194-3@gated-at.bofh.it>
X-Original-To	jic23@kernel.org, linux-iio@vger.kernel.org
Dkim-Signature	v=1; a=rsa-sha256; c=simple/simple; d=onstation.org; s=default; t=1480817995; bh=32W7pXjGxAIeI8ROb2fqZrE4gMJmdk8+wrwx0Pdj5zA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BC56gTmIJgoyx68nGTsFQ+xdKvVbK0spZJwP5XNxbNnNS/j1MflGNNli2EEd1cgJq kH0zaMdQgxEv+DlsE/afapbF+BndXquXKZE7OJNnSR2ftabz0LIW1Nlsf/vDSYXmHO u+8CPPPZ9IBZuejyNu5wp9rOhiej4c538rDjJkw0=
X-Mailer	git-send-email 2.7.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	75
Organization	linux.* mail to news gateway
X-Original-Cc	gregkh@linuxfoundation.org, devel@driverdev.osuosl.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-kernel@vger.kernel.org, ldewangan@nvidia.com
X-Original-Date	Sat, 3 Dec 2016 21:19:37 -0500
X-Original-Message-ID	<1480817983-32359-14-git-send-email-masneyb@onstation.org>
X-Original-References	<1480817983-32359-1-git-send-email-masneyb@onstation.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1535561

Show key headers only | View raw

When isl29028_set_proxim_sampling() fails, it was up to both callers to
log the failure message. This patch moves the logging into
isl29028_set_proxim_sampling() to reduce the overall amount of code in
the driver.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/staging/iio/light/isl29028.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index 23a4db8..0c8a878 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -79,18 +79,28 @@ struct isl29028_chip {
 static int isl29028_set_proxim_sampling(struct isl29028_chip *chip,
 					unsigned int sampling)
 {
+	struct device *dev = regmap_get_device(chip->regmap);
 	static unsigned int prox_period[] = {800, 400, 200, 100, 75, 50, 12, 0};
 	unsigned int sel;
 	unsigned int period = DIV_ROUND_UP(1000, sampling);
+	int ret;
 
 	for (sel = 0; sel < ARRAY_SIZE(prox_period); ++sel) {
 		if (period >= prox_period[sel])
 			break;
 	}
 
-	return regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-				  ISL29028_CONF_PROX_SLP_MASK,
-				  sel << ISL29028_CONF_PROX_SLP_SH);
+	ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
+				 ISL29028_CONF_PROX_SLP_MASK,
+				 sel << ISL29028_CONF_PROX_SLP_SH);
+	if (ret < 0)
+		dev_err(dev,
+			"%s(): Error %d setting the proximity sampling\n",
+			__func__, ret);
+	else
+		chip->prox_sampling = sampling;
+
+	return ret;
 }
 
 static int isl29028_enable_proximity(struct isl29028_chip *chip)
@@ -296,14 +306,6 @@ static int isl29028_write_raw(struct iio_dev *indio_dev,
 		}
 
 		ret = isl29028_set_proxim_sampling(chip, val);
-		if (ret < 0) {
-			dev_err(dev,
-				"Setting proximity samp_freq fail, err %d\n",
-				ret);
-			break;
-		}
-
-		chip->prox_sampling = val;
 		break;
 	case IIO_LIGHT:
 		if (mask != IIO_CHAN_INFO_SCALE) {
@@ -452,10 +454,8 @@ static int isl29028_chip_init_and_power_on(struct isl29028_chip *chip)
 	}
 
 	ret = isl29028_set_proxim_sampling(chip, chip->prox_sampling);
-	if (ret < 0) {
-		dev_err(dev, "setting the proximity, err = %d\n", ret);
+	if (ret < 0)
 		return ret;
-	}
 
 	ret = isl29028_set_als_scale(chip, chip->lux_scale);
 	if (ret < 0)
-- 
2.7.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 13/19] staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling() Brian Masney <masneyb@onstation.org> - 2016-12-04 03:30 +0100

csiph-web