From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org
Cc: Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Michael Hennerich <Michael.Hennerich@analog.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v2 08/12] staging: iio: accel: adis16203: Trivial whitespace cleanup
Date: Sun, 29 Jan 2023 15:55:58 +0000 [thread overview]
Message-ID: <20230129155602.740743-9-jic23@kernel.org> (raw)
In-Reply-To: <20230129155602.740743-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Identation etc in this driver was inconsistent. Fix that.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/staging/iio/accel/adis16203.c | 97 +++++++++++++--------------
1 file changed, 46 insertions(+), 51 deletions(-)
diff --git a/drivers/staging/iio/accel/adis16203.c b/drivers/staging/iio/accel/adis16203.c
index 271e560c41c0..20e9c9eb9436 100644
--- a/drivers/staging/iio/accel/adis16203.c
+++ b/drivers/staging/iio/accel/adis16203.c
@@ -16,49 +16,49 @@
#define ADIS16203_STARTUP_DELAY_MS 220
-#define ADIS16203_FLASH_CNT 0x00
-#define ADIS16203_SUPPLY_OUT 0x02
-#define ADIS16203_AUX_ADC 0x08
-#define ADIS16203_TEMP_OUT 0x0A
-#define ADIS16203_INCL_OUT 0x0C
-#define ADIS16203_INCL_OUT_180 0x0E
-#define ADIS16203_INCL_NULL 0x18
-#define ADIS16203_ALM_MAG1 0x20
-#define ADIS16203_ALM_MAG2 0x22
-#define ADIS16203_ALM_SMPL1 0x24
-#define ADIS16203_ALM_SMPL2 0x26
-#define ADIS16203_ALM_CTRL 0x28
-#define ADIS16203_AUX_DAC 0x30
-#define ADIS16203_GPIO_CTRL 0x32
-#define ADIS16203_MSC_CTRL 0x34
-#define ADIS16203_SMPL_PRD 0x36
-#define ADIS16203_AVG_CNT 0x38
-#define ADIS16203_SLP_CNT 0x3A
-#define ADIS16203_DIAG_STAT 0x3C
-#define ADIS16203_GLOB_CMD 0x3E
-
-#define ADIS16203_MSC_CTRL_PWRUP_SELF_TEST_DIS BIT(10)
-#define ADIS16203_MSC_CTRL_REVERSE_ROT_EN BIT(9)
-#define ADIS16203_MSC_CTRL_SELF_TEST_EN BIT(8)
-#define ADIS16203_MSC_CTRL_DATA_RDY_EN BIT(2)
-#define ADIS16203_MSC_CTRL_ACTIVE_HIGH BIT(1)
-#define ADIS16203_MSC_CTRL_DATA_RDY_DIO1 BIT(0)
-
-#define ADIS16203_DIAG_STAT_ALARM2 BIT(9)
-#define ADIS16203_DIAG_STAT_ALARM1 BIT(8)
-#define ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT 5
-#define ADIS16203_DIAG_STAT_SPI_FAIL_BIT 3
-#define ADIS16203_DIAG_STAT_FLASH_UPT_BIT 2
-#define ADIS16203_DIAG_STAT_POWER_HIGH_BIT 1
-#define ADIS16203_DIAG_STAT_POWER_LOW_BIT 0
-
-#define ADIS16203_GLOB_CMD_SW_RESET BIT(7)
-#define ADIS16203_GLOB_CMD_CLEAR_STAT BIT(4)
-#define ADIS16203_GLOB_CMD_FACTORY_CAL BIT(1)
-
-#define ADIS16203_ERROR_ACTIVE BIT(14)
-
-#define ADIS16203_INCLI_NULL_MSK GENMASK(13, 0)
+#define ADIS16203_FLASH_CNT 0x00
+#define ADIS16203_SUPPLY_OUT 0x02
+#define ADIS16203_AUX_ADC 0x08
+#define ADIS16203_TEMP_OUT 0x0A
+#define ADIS16203_INCL_OUT 0x0C
+#define ADIS16203_INCL_OUT_180 0x0E
+#define ADIS16203_INCL_NULL 0x18
+#define ADIS16203_ALM_MAG1 0x20
+#define ADIS16203_ALM_MAG2 0x22
+#define ADIS16203_ALM_SMPL1 0x24
+#define ADIS16203_ALM_SMPL2 0x26
+#define ADIS16203_ALM_CTRL 0x28
+#define ADIS16203_AUX_DAC 0x30
+#define ADIS16203_GPIO_CTRL 0x32
+#define ADIS16203_MSC_CTRL 0x34
+#define ADIS16203_SMPL_PRD 0x36
+#define ADIS16203_AVG_CNT 0x38
+#define ADIS16203_SLP_CNT 0x3A
+#define ADIS16203_DIAG_STAT 0x3C
+#define ADIS16203_GLOB_CMD 0x3E
+
+#define ADIS16203_MSC_CTRL_PWRUP_SELF_TEST_DIS BIT(10)
+#define ADIS16203_MSC_CTRL_REVERSE_ROT_EN BIT(9)
+#define ADIS16203_MSC_CTRL_SELF_TEST_EN BIT(8)
+#define ADIS16203_MSC_CTRL_DATA_RDY_EN BIT(2)
+#define ADIS16203_MSC_CTRL_ACTIVE_HIGH BIT(1)
+#define ADIS16203_MSC_CTRL_DATA_RDY_DIO1 BIT(0)
+
+#define ADIS16203_DIAG_STAT_ALARM2 BIT(9)
+#define ADIS16203_DIAG_STAT_ALARM1 BIT(8)
+#define ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT 5
+#define ADIS16203_DIAG_STAT_SPI_FAIL_BIT 3
+#define ADIS16203_DIAG_STAT_FLASH_UPT_BIT 2
+#define ADIS16203_DIAG_STAT_POWER_HIGH_BIT 1
+#define ADIS16203_DIAG_STAT_POWER_LOW_BIT 0
+
+#define ADIS16203_GLOB_CMD_SW_RESET BIT(7)
+#define ADIS16203_GLOB_CMD_CLEAR_STAT BIT(4)
+#define ADIS16203_GLOB_CMD_FACTORY_CAL BIT(1)
+
+#define ADIS16203_ERROR_ACTIVE BIT(14)
+
+#define ADIS16203_INCLI_NULL_MSK GENMASK(13, 0)
enum adis16203_scan {
ADIS16203_SCAN_INCLI_X,
@@ -69,9 +69,7 @@ enum adis16203_scan {
static int adis16203_write_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
- int val,
- int val2,
- long mask)
+ int val, int val2, long mask)
{
struct adis *st = iio_priv(indio_dev);
@@ -84,18 +82,16 @@ static int adis16203_write_raw(struct iio_dev *indio_dev,
static int adis16203_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
- int *val, int *val2,
- long mask)
+ int *val, int *val2, long mask)
{
struct adis *st = iio_priv(indio_dev);
int ret;
-
s16 val16;
switch (mask) {
case IIO_CHAN_INFO_RAW:
return adis_single_conversion(indio_dev, chan,
- ADIS16203_ERROR_ACTIVE, val);
+ ADIS16203_ERROR_ACTIVE, val);
case IIO_CHAN_INFO_SCALE:
switch (chan->type) {
case IIO_VOLTAGE:
@@ -220,7 +216,6 @@ static const struct of_device_id adis16203_of_match[] = {
{ .compatible = "adi,adis16203" },
{ },
};
-
MODULE_DEVICE_TABLE(of, adis16203_of_match);
static struct spi_driver adis16203_driver = {
--
2.39.1
next prev parent reply other threads:[~2023-01-29 15:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-29 15:55 [PATCH v2 00/12] staging: iio: accel: adis16203 Inclinometer cleanup and graduation Jonathan Cameron
2023-01-29 15:55 ` [PATCH v2 01/12] staging: iio: accel: adis16203: More conventional header ordering Jonathan Cameron
2023-01-29 15:55 ` [PATCH v2 02/12] staging: iio: accel: adis16203: Drop excessive register comments Jonathan Cameron
2023-01-29 15:55 ` [PATCH v2 03/12] staging: iio: accel: adis16203: Rename incli channel registers Jonathan Cameron
2023-01-29 15:55 ` [PATCH v2 04/12] staging: iio: accel: adis16203: Drop the 180 degree offset channel Jonathan Cameron
2023-01-29 15:55 ` [PATCH v2 05/12] staging: iio: accel: adis16203: Simplify handling of calibbias Jonathan Cameron
2023-01-29 15:55 ` [PATCH v2 06/12] staging: iio: accel: adis16203: Drop driver name define Jonathan Cameron
2023-01-29 15:55 ` [PATCH v2 07/12] staging: iio: accel: adis16203: Make units explicit in name of delay define Jonathan Cameron
2023-01-29 15:55 ` Jonathan Cameron [this message]
2023-01-29 15:55 ` [PATCH v2 09/12] staging: iio: accel: adis16203: Drop setting drvdata as nothing gets it Jonathan Cameron
2023-01-29 15:56 ` [PATCH v2 10/12] staging: iio: accel: adis16203: Trivial style cleanup Jonathan Cameron
2023-01-29 15:56 ` [PATCH v2 11/12] staging: iio: accel: adis16203: Move out of staging Jonathan Cameron
2023-01-29 15:56 ` [PATCH v2 12/12] dt-bindings: iio: accel: Add ADIS16203 Inclinometer Jonathan Cameron
2023-01-30 13:35 ` Rob Herring
2023-01-30 15:21 ` Rob Herring
2023-01-30 17:09 ` Jonathan Cameron
2023-01-30 17:24 ` 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=20230129155602.740743-9-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=Michael.Hennerich@analog.com \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--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).