From: David Heidelberg <david@ixit.cz>
To: 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>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: David Heidelberg <david@ixit.cz>, linux-iio@vger.kernel.org
Subject: [PATCH v5 3/7] iio: light: al3320a slightly improve code formatting
Date: Tue, 11 Feb 2020 20:11:57 +0100 [thread overview]
Message-ID: <20200211191201.1049902-4-david@ixit.cz> (raw)
In-Reply-To: <20200211191201.1049902-1-david@ixit.cz>
- modified to be in part with al3010 driver
- cleanup using bitfield, no functionality change intended
Signed-off-by: David Heidelberg <david@ixit.cz>
---
v4
- use GENMASK() and bitfields
- sort headers
- drop init.h unused header
drivers/iio/light/al3320a.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index a21aa99e74e4..89b935b4fe9e 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -9,9 +9,9 @@
* TODO: interrupt support, thresholds
*/
-#include <linux/module.h>
-#include <linux/init.h>
+#include <linux/bitfield.h>
#include <linux/i2c.h>
+#include <linux/module.h>
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
@@ -36,8 +36,7 @@
#define AL3320A_CONFIG_DISABLE 0x00
#define AL3320A_CONFIG_ENABLE 0x01
-#define AL3320A_GAIN_SHIFT 1
-#define AL3320A_GAIN_MASK (BIT(2) | BIT(1))
+#define AL3320A_GAIN_MASK GENMASK(2, 1)
/* chip params default values */
#define AL3320A_DEFAULT_MEAN_TIME 4
@@ -90,7 +89,8 @@ 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);
+ FIELD_PREP(AL3320A_GAIN_MASK,
+ AL3320A_RANGE_3));
if (ret < 0)
return ret;
@@ -133,7 +133,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 = FIELD_GET(AL3320A_GAIN_MASK, ret)
*val = al3320a_scales[ret][0];
*val2 = al3320a_scales[ret][1];
@@ -152,11 +152,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,
+ if (val != al3320a_scales[i][0] ||
+ val2 != al3320a_scales[i][1])
+ continue;
+
+ return i2c_smbus_write_byte_data(data->client,
AL3320A_REG_CONFIG_RANGE,
- i << AL3320A_GAIN_SHIFT);
+ FIELD_PREP(AL3320A_GAIN_MASK, i));
}
break;
}
--
2.25.0
next prev parent reply other threads:[~2020-02-11 19:13 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 19:11 [PATCH v5 0/7] iio: light: AL3010 introduction David Heidelberg
2020-02-11 19:11 ` [PATCH v5 1/7] dt-bindings: iio: light: add support for Dyna-Image AL3320A David Heidelberg
2020-02-15 16:59 ` Jonathan Cameron
2020-02-18 21:01 ` Rob Herring
2020-02-11 19:11 ` [PATCH v5 2/7] dt-bindings: iio: light: add support for Dyna-Image AL3010 David Heidelberg
2020-02-15 17:00 ` Jonathan Cameron
2020-02-18 21:01 ` Rob Herring
2020-02-11 19:11 ` David Heidelberg [this message]
2020-02-15 17:08 ` [PATCH v5 3/7] iio: light: al3320a slightly improve code formatting Jonathan Cameron
2020-02-11 19:11 ` [PATCH v5 4/7] iio: light: add Dyna-Image AL3010 driver David Heidelberg
2020-02-14 15:58 ` Jonathan Cameron
2020-02-14 22:09 ` [PATCH v6] " David Heidelberg
2020-02-15 17:09 ` Jonathan Cameron
2020-02-11 19:11 ` [PATCH v5 5/7] iio: light: al3320a implement suspend support David Heidelberg
2020-02-15 17:15 ` Jonathan Cameron
2020-02-15 17:34 ` David Heidelberg
2020-02-15 18:34 ` Jonathan Cameron
2020-02-15 17:20 ` Jonathan Cameron
2020-02-11 19:12 ` [PATCH v5 6/7] iio: light: al3320a implement devm_add_action_or_reset David Heidelberg
2020-02-15 17:22 ` Jonathan Cameron
2020-02-15 18:38 ` Jonathan Cameron
2020-02-15 19:42 ` David Heidelberg
2020-02-21 11:11 ` Jonathan Cameron
2020-02-11 19:12 ` [PATCH v5 7/7] iio: light: al3320a allow module autoload and polish David Heidelberg
2020-02-15 17:22 ` 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=20200211191201.1049902-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=mark.rutland@arm.com \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
/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).