mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Brian Masney <masneyb@onstation.org>
To: jic23@kernel.org, linux-iio@vger.kernel.org
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
Subject: [PATCH v2 12/15] staging: iio: isl29028: remove enable flag from isl29028_enable_proximity()
Date: Tue, 17 Jan 2017 04:24:59 -0500	[thread overview]
Message-ID: <20170117092502.6951-13-masneyb@onstation.org> (raw)
In-Reply-To: <20170117092502.6951-1-masneyb@onstation.org>

isl29028_enable_proximity() has a boolean argument named enable. This
function is only called once and the enable flag is set to true in that
call. This patch removes the enable parameter from that function.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
The device gets runtime power management support in the next patch in
this set and autosuspends after two seconds of inactivity. Once the
device suspends, the pin that drives the external LED for proximity
sensing will only go high the next time that the user asks for a
reading from the proximity sensor.

This patch also sets the stage for additional cleanups prior to the
introduction of runtime power management support.

 drivers/staging/iio/light/isl29028.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index bc9c01d..f1b3651 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -103,15 +103,13 @@ static int isl29028_set_proxim_sampling(struct isl29028_chip *chip,
 	return ret;
 }
 
-static int isl29028_enable_proximity(struct isl29028_chip *chip, bool enable)
+static int isl29028_enable_proximity(struct isl29028_chip *chip)
 {
 	int ret;
-	int val = 0;
 
-	if (enable)
-		val = ISL29028_CONF_PROX_EN;
 	ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-				 ISL29028_CONF_PROX_EN_MASK, val);
+				 ISL29028_CONF_PROX_EN_MASK,
+				 ISL29028_CONF_PROX_EN);
 	if (ret < 0)
 		return ret;
 
@@ -225,7 +223,7 @@ static int isl29028_read_proxim(struct isl29028_chip *chip, int *prox)
 	int ret;
 
 	if (!chip->enable_prox) {
-		ret = isl29028_enable_proximity(chip, true);
+		ret = isl29028_enable_proximity(chip);
 		if (ret < 0)
 			return ret;
 
-- 
2.9.3

  parent reply	other threads:[~2017-01-17  9:43 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-17  9:24 [PATCH v2 00/15] staging cleanups Brian Masney
2017-01-17  9:24 ` [PATCH v2 01/15] staging: iio: isl29028: made alignment of variables in struct isl29028_chip consistent Brian Masney
2017-01-21 14:29   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 02/15] staging: iio: isl29028: fix alignment of function arguments Brian Masney
2017-01-21 14:30   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 03/15] staging: iio: isl29028: combine isl29028_proxim_get() and isl29028_read_proxim() Brian Masney
2017-01-21 14:41   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 04/15] staging: iio: isl29028: change newlines to improve readability Brian Masney
2017-01-21 14:41   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 05/15] staging: iio: isl29028: remove unused define ISL29028_DEV_ATTR Brian Masney
2017-01-21 14:41   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 06/15] staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling() Brian Masney
2017-01-21 14:37   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 07/15] staging: iio: isl29028: move failure logging into isl29028_set_als_scale() Brian Masney
2017-01-21 14:42   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 08/15] staging: iio: isl29028: made error messages consistent Brian Masney
2017-01-21 14:42   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 09/15] staging: iio: isl29028: remove unnecessary error logging in isl29028_chip_init_and_power_on() Brian Masney
2017-01-21 14:42   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 10/15] staging: iio: isl29028: remove out of memory log message Brian Masney
2017-01-21 14:43   ` Jonathan Cameron
2017-01-17  9:24 ` [PATCH v2 11/15] staging: iio: isl29028: remove unnecessary parenthesis Brian Masney
2017-01-21 14:43   ` Jonathan Cameron
2017-01-17  9:24 ` Brian Masney [this message]
2017-01-21 14:48   ` [PATCH v2 12/15] staging: iio: isl29028: remove enable flag from isl29028_enable_proximity() Jonathan Cameron
2017-01-17  9:25 ` [PATCH v2 13/15] staging: iio: isl29028: only set proximity sampling rate when proximity is enabled Brian Masney
2017-01-21 14:49   ` Jonathan Cameron
2017-01-17  9:25 ` [PATCH v2 14/15] staging: iio: isl29028: only set ALS scale when ALS/IR sensing " Brian Masney
2017-01-21 14:52   ` Jonathan Cameron
2017-01-17  9:25 ` [PATCH v2 15/15] staging: iio: isl29028: add runtime power management support Brian Masney
2017-01-21 14:58   ` Jonathan Cameron
2017-01-21 16:49     ` Brian Masney
2017-01-21 17:35       ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170117092502.6951-13-masneyb@onstation.org \
    --to=masneyb@onstation.org \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=ldewangan@nvidia.com \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®