From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org, Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Cc: Hennerich@vger.kernel.org, Michael <Michael.Hennerich@analog.com>,
Nuno Sa <Nuno.Sa@analog.com>,
lars@metafoo.de, Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v3 18/20] staging:iio:adc:ad7280a: Remove shift from cb_mask state cache.
Date: Sun, 6 Feb 2022 19:03:26 +0000 [thread overview]
Message-ID: <20220206190328.333093-19-jic23@kernel.org> (raw)
In-Reply-To: <20220206190328.333093-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Making the local storage of the Cell Balance mask a simple
bitmap and then shifting it only at time of register write simplifies
several code paths.
Suggested-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/staging/iio/adc/ad7280a.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index a32c32a1226a..a7e16144b013 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -88,6 +88,7 @@
#define AD7280A_ALERT_RELAY_SIG_CHAIN_DOWN (BIT(7) | BIT(6))
#define AD7280A_CELL_BALANCE_REG 0x14 /* D7 to D0, Read/write */
+#define AD7280A_CELL_BALANCE_CHAN_BITMAP_MSK GENMASK(7, 2)
#define AD7280A_CB1_TIMER_REG 0x15 /* D7 to D0, Read/write */
#define AD7280A_CB_TIMER_VAL_MSK GENMASK(7, 3)
#define AD7280A_CB2_TIMER_REG 0x16 /* D7 to D0, Read/write */
@@ -474,7 +475,7 @@ static ssize_t ad7280_show_balance_sw(struct iio_dev *indio_dev,
return sysfs_emit(buf, "%d\n",
!!(st->cb_mask[chan->address >> 8] &
- (1 << ((chan->address & 0xFF) + 2))));
+ BIT(chan->address & 0xFF)));
}
static ssize_t ad7280_store_balance_sw(struct iio_dev *indio_dev,
@@ -496,12 +497,13 @@ static ssize_t ad7280_store_balance_sw(struct iio_dev *indio_dev,
mutex_lock(&st->lock);
if (readin)
- st->cb_mask[devaddr] |= 1 << (ch + 2);
+ st->cb_mask[devaddr] |= BIT(ch);
else
- st->cb_mask[devaddr] &= ~(1 << (ch + 2));
+ st->cb_mask[devaddr] &= ~BIT(ch);
- ret = ad7280_write(st, devaddr, AD7280A_CELL_BALANCE_REG,
- 0, st->cb_mask[devaddr]);
+ ret = ad7280_write(st, devaddr, AD7280A_CELL_BALANCE_REG, 0,
+ FIELD_PREP(AD7280A_CELL_BALANCE_CHAN_BITMAP_MSK,
+ st->cb_mask[devaddr]));
mutex_unlock(&st->lock);
return ret ? ret : len;
--
2.35.1
next prev parent reply other threads:[~2022-02-06 18:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-06 19:03 [PATCH v3 00/20] iio:adc:ad7280a Cleanup and proposed staging graduation Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 01/20] staging:iio:adc:ad7280a: Fix handing of device address bit reversing Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 02/20] staging:iio:adc:ad7280a: Register define cleanup Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 03/20] staging:iio:adc:ad7280a: rename _read() to _read_reg() Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 04/20] staging:iio:adc:ad7280a: Split buff[2] into tx and rx parts Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 05/20] staging:iio:adc:ad7280a: Use bitfield ops to managed fields in transfers Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 06/20] staging:iio:adc:ad7280a: Switch to standard event control Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 07/20] staging:iio:adc:ad7280a: Standardize extended ABI naming Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 08/20] staging:iio:adc:ad7280a: Drop unused timestamp channel Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 09/20] staging:iio:adc:ad7280a: Trivial comment formatting cleanup Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 10/20] staging:iio:adc:ad7280a: Make oversampling_ratio a runtime control Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 11/20] staging:iio:adc:ad7280a: Cleanup includes Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 12/20] staging:iio:ad7280a: Reflect optionality of irq in ABI Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 13/20] staging:iio:adc:ad7280a: Use a local dev pointer to avoid &spi->dev Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 14/20] staging:iio:adc:ad7280a: Use device properties to replace platform data Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 15/20] staging:iio:adc:ad7280a: Drop buggy support for early termination of AUX alert Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 16/20] dt-bindings:iio:adc:ad7280a: Add binding Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 17/20] iio:adc:ad7280a: Document ABI for cell balance switches Jonathan Cameron
2022-02-06 19:03 ` Jonathan Cameron [this message]
2022-02-06 19:03 ` [PATCH v3 19/20] staging:iio:adc:ad7280a: Use more conservative delays to allow 105C operation Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 20/20] iio:adc:ad7280a: Move out of staging Jonathan Cameron
2022-02-13 20:11 ` [PATCH v3 00/20] iio:adc:ad7280a Cleanup and proposed staging graduation Marcelo Schmitt
2022-02-18 11:59 ` 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=20220206190328.333093-19-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Hennerich@vger.kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=Michael.Hennerich@analog.com \
--cc=Nuno.Sa@analog.com \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=marcelo.schmitt1@gmail.com \
/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