linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Heidelberg <david@ixit.cz>
To: linux-iio@vger.kernel.org
Cc: David Heidelberg <david@ixit.cz>,
	Dmitry Osipenko <digetx@gmail.com>,
	Daniel Baluta <daniel.baluta@nxp.com>,
	Jonathan Cameron <jic23@kernel.org>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Subject: [PATCH v2 3/7] iio: light: al3320a slightly improve code formatting
Date: Tue, 28 Jan 2020 14:30:48 +0100	[thread overview]
Message-ID: <20200128133052.201587-4-david@ixit.cz> (raw)
In-Reply-To: <20200128133052.201587-1-david@ixit.cz>

Modified to be in part with al3010 driver.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3320a.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index a21aa99e74e4..613830b7df6e 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -38,6 +38,11 @@
 
 #define AL3320A_GAIN_SHIFT		1
 #define AL3320A_GAIN_MASK		(BIT(2) | BIT(1))
+#define AL3320A_GAIN_READ(g) \
+	(((g) & AL3320A_GAIN_MASK) >> AL3320A_GAIN_SHIFT)
+#define AL3320A_GAIN_WRITE(g) \
+	(((g) << AL3320A_GAIN_SHIFT) & AL3320A_GAIN_MASK)
+
 
 /* chip params default values */
 #define AL3320A_DEFAULT_MEAN_TIME	4
@@ -90,7 +95,7 @@ static int al3320a_init(struct al3320a_data *data)
 		return ret;
 
 	ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG_RANGE,
-					AL3320A_RANGE_3 << AL3320A_GAIN_SHIFT);
+					AL3320A_GAIN_WRITE(AL3320A_RANGE_3));
 	if (ret < 0)
 		return ret;
 
@@ -133,7 +138,7 @@ static int al3320a_read_raw(struct iio_dev *indio_dev,
 		if (ret < 0)
 			return ret;
 
-		ret = (ret & AL3320A_GAIN_MASK) >> AL3320A_GAIN_SHIFT;
+		ret = AL3320A_GAIN_READ(ret);
 		*val = al3320a_scales[ret][0];
 		*val2 = al3320a_scales[ret][1];
 
@@ -152,11 +157,13 @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
 	switch (mask) {
 	case IIO_CHAN_INFO_SCALE:
 		for (i = 0; i < ARRAY_SIZE(al3320a_scales); i++) {
-			if (val == al3320a_scales[i][0] &&
-			    val2 == al3320a_scales[i][1])
-				return i2c_smbus_write_byte_data(data->client,
-					AL3320A_REG_CONFIG_RANGE,
-					i << AL3320A_GAIN_SHIFT);
+			if (val != al3320a_scales[i][0] ||
+			    val2 != al3320a_scales[i][1])
+				continue;
+
+			return i2c_smbus_write_byte_data(data->client,
+						AL3320A_REG_CONFIG_RANGE,
+						AL3320A_GAIN_WRITE(i));
 		}
 		break;
 	}
-- 
2.25.0


  parent reply	other threads:[~2020-01-28 13:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-28 13:30 [PATCH 0/7] iio: light: AL3010 introduction David Heidelberg
2020-01-28 13:30 ` [PATCH v2 1/7] dt-bindings: iio: light: add support for Dyna-Image AL3320A David Heidelberg
2020-01-31 14:23   ` Rob Herring
2020-01-28 13:30 ` [PATCH v2 2/7] dt-bindings: iio: light: add support for Dyna-Image AL3010 David Heidelberg
2020-01-28 19:43   ` Dmitry Osipenko
2020-01-31 14:24   ` Rob Herring
2020-01-31 14:28     ` Dmitry Osipenko
2020-01-28 13:30 ` David Heidelberg [this message]
2020-01-28 13:30 ` [PATCH v2 4/7] iio: light: add Dyna-Image AL3010 driver David Heidelberg
2020-01-28 13:30 ` [PATCH v2 5/7] iio: light: al3010 implement suspend support David Heidelberg
2020-01-28 19:46   ` Dmitry Osipenko
2020-01-28 13:30 ` [PATCH v2 6/7] iio: light: al3320a " David Heidelberg
2020-01-28 13:30 ` [PATCH v2 7/7] iio: light: al3320a allow module autoload and polish David Heidelberg

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=20200128133052.201587-4-david@ixit.cz \
    --to=david@ixit.cz \
    --cc=daniel.baluta@nxp.com \
    --cc=digetx@gmail.com \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@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;
as well as URLs for NNTP newsgroup(s).