From: Daniel Campello <campello@chromium.org>
To: LKML <devicetree@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>
Cc: Jonathan Cameron <jic23@kernel.org>,
Daniel Campello <campello@chromium.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Stephen Boyd <swboyd@chromium.org>,
Douglas Anderson <dianders@chromium.org>,
Gwendal Grignou <gwendal@chromium.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
linux-iio@vger.kernel.org
Subject: [PATCH v2 12/14] iio: sx9310: Miscellaneous format fixes
Date: Tue, 28 Jul 2020 17:05:18 -0600 [thread overview]
Message-ID: <20200728170317.v2.12.I426355a035f0394dfccba5bb2bc6f8db872c4be3@changeid> (raw)
In-Reply-To: <20200728230520.2011240-1-campello@chromium.org>
Miscellaneous format fixes throughout the whole file.
Signed-off-by: Daniel Campello <campello@chromium.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
---
Changes in v2: None
drivers/iio/proximity/sx9310.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
index 517ff76acd00a0..b15ace422862ff 100644
--- a/drivers/iio/proximity/sx9310.c
+++ b/drivers/iio/proximity/sx9310.c
@@ -91,28 +91,21 @@
#define SX9310_REG_SAR_CTRL2_SAROFFSET_DEFAULT 0x3c
#define SX9310_REG_SENSOR_SEL 0x30
-
#define SX9310_REG_USE_MSB 0x31
#define SX9310_REG_USE_LSB 0x32
-
#define SX9310_REG_AVG_MSB 0x33
#define SX9310_REG_AVG_LSB 0x34
-
#define SX9310_REG_DIFF_MSB 0x35
#define SX9310_REG_DIFF_LSB 0x36
-
#define SX9310_REG_OFFSET_MSB 0x37
#define SX9310_REG_OFFSET_LSB 0x38
-
#define SX9310_REG_SAR_MSB 0x39
#define SX9310_REG_SAR_LSB 0x3a
-
#define SX9310_REG_I2C_ADDR 0x40
#define SX9310_REG_PAUSE 0x41
#define SX9310_REG_WHOAMI 0x42
#define SX9310_WHOAMI_VALUE 0x01
#define SX9311_WHOAMI_VALUE 0x02
-
#define SX9310_REG_RESET 0x7f
#define SX9310_SOFT_RESET 0xde
@@ -403,7 +396,7 @@ static int sx9310_read_proximity(struct sx9310_data *data,
goto out_disable_irq;
*val = sign_extend32(be16_to_cpu(rawval),
- (chan->address == SX9310_REG_DIFF_MSB ? 11 : 15));
+ chan->address == SX9310_REG_DIFF_MSB ? 11 : 15);
if (data->client->irq) {
ret = sx9310_disable_irq(data, SX9310_CONVDONE_IRQ);
@@ -433,8 +426,9 @@ static int sx9310_read_proximity(struct sx9310_data *data,
static int sx9310_read_samp_freq(struct sx9310_data *data, int *val, int *val2)
{
unsigned int regval;
- int ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0, ®val);
+ int ret;
+ ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0, ®val);
if (ret)
return ret;
@@ -519,10 +513,9 @@ static irqreturn_t sx9310_irq_handler(int irq, void *private)
iio_trigger_poll(data->trig);
/*
- * Even if no event is enabled, we need to wake the thread to
- * clear the interrupt state by reading SX9310_REG_IRQ_SRC. It
- * is not possible to do that here because regmap_read takes a
- * mutex.
+ * Even if no event is enabled, we need to wake the thread to clear the
+ * interrupt state by reading SX9310_REG_IRQ_SRC.
+ * It is not possible to do that here because regmap_read takes a mutex.
*/
return IRQ_WAKE_THREAD;
}
@@ -639,7 +632,7 @@ static int sx9310_write_event_config(struct iio_dev *indio_dev,
static struct attribute *sx9310_attributes[] = {
&iio_dev_attr_sampling_frequency_available.dev_attr.attr,
- NULL,
+ NULL
};
static const struct attribute_group sx9310_attribute_group = {
@@ -970,7 +963,6 @@ static int __maybe_unused sx9310_suspend(struct device *dev)
mutex_lock(&data->mutex);
ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0,
&data->suspend_ctrl0);
-
if (ret)
goto out;
@@ -1016,21 +1008,21 @@ static const struct dev_pm_ops sx9310_pm_ops = {
static const struct acpi_device_id sx9310_acpi_match[] = {
{ "STH9310", SX9310_WHOAMI_VALUE },
{ "STH9311", SX9311_WHOAMI_VALUE },
- {},
+ {}
};
MODULE_DEVICE_TABLE(acpi, sx9310_acpi_match);
static const struct of_device_id sx9310_of_match[] = {
{ .compatible = "semtech,sx9310", (void *)SX9310_WHOAMI_VALUE },
{ .compatible = "semtech,sx9311", (void *)SX9311_WHOAMI_VALUE },
- {},
+ {}
};
MODULE_DEVICE_TABLE(of, sx9310_of_match);
static const struct i2c_device_id sx9310_id[] = {
{ "sx9310", SX9310_WHOAMI_VALUE },
{ "sx9311", SX9311_WHOAMI_VALUE },
- {},
+ {}
};
MODULE_DEVICE_TABLE(i2c, sx9310_id);
--
2.28.0.163.g6104cc2f0b6-goog
next prev parent reply other threads:[~2020-07-28 23:06 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-25 0:40 [PATCH] iio: sx9310: Fixes dropped on initial commit Daniel Campello
2020-07-26 8:10 ` Andy Shevchenko
2020-07-26 11:53 ` Jonathan Cameron
2020-07-28 15:12 ` [PATCH 00/15] sx9310 iio driver updates Daniel Campello
2020-07-28 15:12 ` [PATCH 01/15] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-07-28 22:06 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 02/15] iio: sx9310: Update macros declarations Daniel Campello
2020-07-28 19:42 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 03/15] iio: sx9310: Fix irq handling Daniel Campello
2020-07-28 18:08 ` Andy Shevchenko
2020-07-28 20:07 ` Daniel Campello
2020-07-28 20:15 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 04/15] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-07-28 18:09 ` Andy Shevchenko
2020-07-28 20:47 ` Daniel Campello
2020-07-28 21:28 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 05/15] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-07-28 18:10 ` Andy Shevchenko
2020-07-28 19:32 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 06/15] iio: sx9310: Align memory Daniel Campello
2020-07-28 18:11 ` Andy Shevchenko
2020-07-28 21:26 ` Daniel Campello
2020-07-29 6:52 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 07/15] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-07-28 18:13 ` Andy Shevchenko
2020-07-28 19:37 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 08/15] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-07-28 18:14 ` Andy Shevchenko
2020-07-28 19:37 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 09/15] iio: sx9310: Update copyright Daniel Campello
2020-07-28 15:12 ` [PATCH 10/15] iio: sx9310: Simplify error return handling Daniel Campello
2020-07-28 18:15 ` Andy Shevchenko
2020-07-28 19:40 ` Stephen Boyd
2020-07-28 21:23 ` Daniel Campello
2020-07-28 21:32 ` Stephen Boyd
2020-07-28 22:06 ` Daniel Campello
2020-07-28 15:12 ` [PATCH 11/15] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-07-28 18:16 ` Andy Shevchenko
2020-07-28 19:41 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 12/15] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-07-28 18:16 ` Andy Shevchenko
2020-07-28 19:41 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 13/15] iio: sx9310: Add newlines to printks Daniel Campello
2020-07-28 18:19 ` Andy Shevchenko
2020-07-28 18:24 ` Joe Perches
2020-07-28 18:32 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 14/15] iio: sx9310: Drop channel_users[] Daniel Campello
2020-07-28 18:20 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 15/15] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-07-28 18:21 ` Andy Shevchenko
2020-07-28 23:05 ` [PATCH v2 00/14] sx9310 iio driver updates Daniel Campello
2020-07-28 23:05 ` [PATCH v2 01/14] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-07-29 0:52 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 02/14] iio: sx9310: Update macros declarations Daniel Campello
2020-07-28 23:05 ` [PATCH v2 03/14] iio: sx9310: Fix irq handling Daniel Campello
2020-07-29 8:40 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 04/14] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-07-29 6:54 ` Andy Shevchenko
2020-07-29 8:38 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 05/14] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-07-28 23:05 ` [PATCH v2 06/14] iio: sx9310: Fixes various memory handling Daniel Campello
2020-07-28 23:05 ` [PATCH v2 07/14] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-07-29 1:03 ` Stephen Boyd
2020-07-29 7:00 ` Andy Shevchenko
2020-07-31 15:44 ` Daniel Campello
2020-07-31 15:52 ` Andy Shevchenko
2020-07-28 23:05 ` [PATCH v2 08/14] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-07-28 23:05 ` [PATCH v2 09/14] iio: sx9310: Update copyright Daniel Campello
2020-07-28 23:05 ` [PATCH v2 10/14] iio: sx9310: Simplify error return handling Daniel Campello
2020-07-29 8:42 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 11/14] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-07-28 23:05 ` Daniel Campello [this message]
2020-07-28 23:05 ` [PATCH v2 13/14] iio: sx9310: Drop channel_users[] Daniel Campello
2020-07-28 23:05 ` [PATCH v2 14/14] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-07-29 0:50 ` [PATCH v2 00/14] sx9310 iio driver updates Stephen Boyd
2020-07-29 9:20 ` Stephen Boyd
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=20200728170317.v2.12.I426355a035f0394dfccba5bb2bc6f8db872c4be3@changeid \
--to=campello@chromium.org \
--cc=andy.shevchenko@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=gwendal@chromium.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 \
--cc=swboyd@chromium.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.