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, Jon.Brenner@ams.com
Subject: [PATCH 08/13] staging: iio: tsl2x7x: correct alignment of parenthesis
Date: Thu, 19 Oct 2017 16:06:27 -0400 [thread overview]
Message-ID: <20171019200632.25820-9-masneyb@onstation.org> (raw)
In-Reply-To: <20171019200632.25820-1-masneyb@onstation.org>
Correct error from checkpatch.pl to improve code readibility: Alignment
should match open parenthesis. This involved shortening the name of
tsl2x7x_als_gainadj and tsl2x7x_prx_gainadj to tsl2x7x_als_gain and
tsl2x7x_prx_gain respectively. This also required removing the
ch0lux and ch1lux local variables in order to get the line short
enough.
Signed-off-by: Brian Masney <masneyb@onstation.org>
---
drivers/staging/iio/light/tsl2x7x.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c
index 6cc89cd6505e..886be9aa3c0f 100644
--- a/drivers/staging/iio/light/tsl2x7x.c
+++ b/drivers/staging/iio/light/tsl2x7x.c
@@ -243,14 +243,14 @@ static const struct tsl2x7x_settings tsl2x7x_default_settings = {
.prox_pulse_count = 8
};
-static const s16 tsl2X7X_als_gainadj[] = {
+static const s16 tsl2x7x_als_gain[] = {
1,
8,
16,
120
};
-static const s16 tsl2X7X_prx_gainadj[] = {
+static const s16 tsl2x7x_prx_gain[] = {
1,
2,
4,
@@ -384,11 +384,10 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
if (p->ratio == 0) {
lux = 0;
} else {
- ch0lux = DIV_ROUND_UP(ch0 * p->ch0,
- tsl2X7X_als_gainadj[chip->settings.als_gain]);
- ch1lux = DIV_ROUND_UP(ch1 * p->ch1,
- tsl2X7X_als_gainadj[chip->settings.als_gain]);
- lux = ch0lux - ch1lux;
+ lux = DIV_ROUND_UP(ch0 * p->ch0,
+ tsl2x7x_als_gain[chip->settings.als_gain]) -
+ DIV_ROUND_UP(ch1 * p->ch1,
+ tsl2x7x_als_gain[chip->settings.als_gain]);
}
/* note: lux is 31 bit max at this point */
@@ -1263,9 +1262,9 @@ static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
break;
case IIO_CHAN_INFO_CALIBSCALE:
if (chan->type == IIO_LIGHT)
- *val = tsl2X7X_als_gainadj[chip->settings.als_gain];
+ *val = tsl2x7x_als_gain[chip->settings.als_gain];
else
- *val = tsl2X7X_prx_gainadj[chip->settings.prox_gain];
+ *val = tsl2x7x_prx_gain[chip->settings.prox_gain];
ret = IIO_VAL_INT;
break;
case IIO_CHAN_INFO_CALIBBIAS:
--
2.13.6
next prev parent reply other threads:[~2017-10-19 20:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 20:06 [PATCH 00/13] staging: iio: tsl2x7x: staging cleanups Brian Masney
2017-10-19 20:06 ` [PATCH 01/13] staging: iio: tsl2x7x: migrate *_thresh_period sysfs attributes to iio_event_spec Brian Masney
2017-10-21 17:31 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 02/13] staging: iio: tsl2x7x: remove unused tsl2x7x_parse_result structure Brian Masney
2017-10-21 17:32 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 03/13] staging: iio: tsl2x7x: sort #includes Brian Masney
2017-10-21 17:34 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 04/13] staging: iio: tsl2x7x: remove unnecessary struct iio_dev definition Brian Masney
2017-10-21 17:34 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 05/13] staging: iio: tsl2x7x: changed #defines to be aligned on the same column Brian Masney
2017-10-21 17:35 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 06/13] staging: iio: tsl2x7x: convert in_proximity0_calibscale_available to use IIO_CONST_ATTR Brian Masney
2017-10-21 17:36 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 07/13] staging: iio: tsl2x7x: remove unnecessary parentheses Brian Masney
2017-10-21 17:38 ` Jonathan Cameron
2017-10-19 20:06 ` Brian Masney [this message]
2017-10-21 17:40 ` [PATCH 08/13] staging: iio: tsl2x7x: correct alignment of parenthesis Jonathan Cameron
2017-10-19 20:06 ` [PATCH 09/13] " Brian Masney
2017-10-21 17:41 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 10/13] staging: iio: tsl2x7x: rename power defines to improve code readability Brian Masney
2017-10-21 17:42 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 11/13] staging: iio: tsl2x7x: fix alignment of break statements Brian Masney
2017-10-21 17:44 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 12/13] staging: iio: tsl2x7x: put function definitions on a single line Brian Masney
2017-10-21 17:45 ` Jonathan Cameron
2017-10-19 20:06 ` [PATCH 13/13] staging: iio: tsl2x7x: add goto for TSL2X7X_LUX_CALC_OVER_FLOW Brian Masney
2017-10-21 17:46 ` Jonathan Cameron
2017-10-23 9:06 ` Dan Carpenter
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=20171019200632.25820-9-masneyb@onstation.org \
--to=masneyb@onstation.org \
--cc=Jon.Brenner@ams.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--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®