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 02/19] staging: iio: isl29028: remove enable flag from isl29028_enable_proximity()
Date: Sat, 3 Dec 2016 21:19:26 -0500 [thread overview]
Message-ID: <1480817983-32359-3-git-send-email-masneyb@onstation.org> (raw)
In-Reply-To: <1480817983-32359-1-git-send-email-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>
---
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 4e35d00..c8e234d 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -93,15 +93,13 @@ static int isl29028_set_proxim_sampling(struct isl29028_chip *chip,
sel << ISL29028_CONF_PROX_SLP_SH);
}
-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;
@@ -215,7 +213,7 @@ static int isl29028_proxim_get(struct isl29028_chip *chip, int *prox_data)
int ret;
if (!chip->enable_prox) {
- ret = isl29028_enable_proximity(chip, true);
+ ret = isl29028_enable_proximity(chip);
if (ret < 0)
return ret;
chip->enable_prox = true;
--
2.7.4
next prev parent reply other threads:[~2016-12-04 2:20 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 2:19 [PATCH 00/19] staging: iio: isl29028: staging cleanups Brian Masney
2016-12-04 2:19 ` [PATCH 01/19] staging: iio: isl29028: remove nested if statements Brian Masney
2016-12-04 11:01 ` Jonathan Cameron
2016-12-04 2:19 ` Brian Masney [this message]
2016-12-04 11:13 ` [PATCH 02/19] staging: iio: isl29028: remove enable flag from isl29028_enable_proximity() Jonathan Cameron
2016-12-04 11:16 ` Jonathan Cameron
2017-01-14 20:00 ` Brian Masney
2017-01-15 14:33 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 03/19] staging: iio: isl29028: remove chip test and defaults from isl29028_chip_init() Brian Masney
2016-12-04 11:23 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 04/19] staging: iio: isl29028: add power management support Brian Masney
2016-12-04 11:37 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 05/19] staging: iio: isl29028: made alignment of #defines consistent Brian Masney
2016-12-04 11:39 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 06/19] staging: iio: isl29028: made alignment of variables in struct isl29028_chip consistent Brian Masney
2016-12-04 2:19 ` [PATCH 07/19] staging: iio: isl29028: fix alignment of function arguments Brian Masney
2016-12-04 2:19 ` [PATCH 08/19] staging: iio: isl29028: combine isl29028_proxim_get() and isl29028_read_proxim() Brian Masney
2016-12-04 2:19 ` [PATCH 09/19] staging: iio: isl29028: change newlines to improve readability Brian Masney
2016-12-04 2:19 ` [PATCH 10/19] staging: iio: isl29028: remove unused define ISL29028_DEV_ATTR Brian Masney
2016-12-04 2:19 ` [PATCH 11/19] staging: iio: isl29028: made column alignment in isl29028_channels consistent Brian Masney
2016-12-04 11:48 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 12/19] staging: iio: isl29028: fix comparison between signed and unsigned integers Brian Masney
2016-12-05 20:53 ` Dan Carpenter
2016-12-06 0:10 ` Brian Masney
2016-12-06 10:19 ` Dan Carpenter
2016-12-04 2:19 ` [PATCH 13/19] staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling() Brian Masney
2016-12-04 11:50 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 14/19] staging: iio: isl29028: move failure logging into isl29028_set_als_scale() Brian Masney
2016-12-04 11:51 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 15/19] staging: iio: isl29028: made error messages consistent Brian Masney
2016-12-04 2:19 ` [PATCH 16/19] staging: iio: isl29028: remove unnecessary error logging in isl29028_chip_init_and_power_on() Brian Masney
2016-12-04 2:19 ` [PATCH 17/19] staging: iio: isl29028: remove out of memory log message Brian Masney
2016-12-04 2:19 ` [PATCH 18/19] staging: iio: isl29028: remove unnecessary parenthesis Brian Masney
2016-12-04 2:19 ` [PATCH 19/19] staging: iio: isl29028: remove legacy device tree binding Brian Masney
2016-12-04 11:55 ` Jonathan Cameron
2017-01-08 9:50 ` 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=1480817983-32359-3-git-send-email-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®