From: Nuno Sa <nuno.sa@analog.com>
To: <linux-iio@vger.kernel.org>
Cc: Jonathan Cameron <jic23@kernel.org>,
Michael Hennerich <Michael.Hennerich@analog.com>,
Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH v2 9/9] iio: adis16400: do not directly change spi 'max_speed_hz'
Date: Thu, 22 Apr 2021 12:19:11 +0200 [thread overview]
Message-ID: <20210422101911.135630-10-nuno.sa@analog.com> (raw)
In-Reply-To: <20210422101911.135630-1-nuno.sa@analog.com>
With commit 65f2f661e71d ("iio: adis: add burst_max_speed_hz variable"), we
just need to define 'burst_max_speed_hz' and the adis core will take
care of setting up the spi transfers for burst mode. Hence, we fix
a potential race with the spi core where we could be left witn an
invalid 'max_speed_hz'.
Fixes: 5eda3550a3cc1 ("staging:iio:adis16400: Preallocate transfer message")
Signed-off-by: Nuno Sa <nuno.sa@analog.com>
---
drivers/iio/imu/adis16400.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/iio/imu/adis16400.c b/drivers/iio/imu/adis16400.c
index b2f92b55b910..cb8d3ffab6fc 100644
--- a/drivers/iio/imu/adis16400.c
+++ b/drivers/iio/imu/adis16400.c
@@ -641,25 +641,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
struct iio_dev *indio_dev = pf->indio_dev;
struct adis16400_state *st = iio_priv(indio_dev);
struct adis *adis = &st->adis;
- u32 old_speed_hz = st->adis.spi->max_speed_hz;
void *buffer;
int ret;
- if (!(st->variant->flags & ADIS16400_NO_BURST) &&
- st->adis.spi->max_speed_hz > ADIS16400_SPI_BURST) {
- st->adis.spi->max_speed_hz = ADIS16400_SPI_BURST;
- spi_setup(st->adis.spi);
- }
-
ret = spi_sync(adis->spi, &adis->msg);
if (ret)
dev_err(&adis->spi->dev, "Failed to read data: %d\n", ret);
- if (!(st->variant->flags & ADIS16400_NO_BURST)) {
- st->adis.spi->max_speed_hz = old_speed_hz;
- spi_setup(st->adis.spi);
- }
-
if (st->variant->flags & ADIS16400_BURST_DIAG_STAT)
buffer = adis->buffer + sizeof(u16);
else
@@ -965,7 +953,8 @@ static const char * const adis16400_status_error_msgs[] = {
BIT(ADIS16400_DIAG_STAT_POWER_LOW), \
.timeouts = (_timeouts), \
.burst_reg_cmd = ADIS16400_GLOB_CMD, \
- .burst_len = (_burst_len) \
+ .burst_len = (_burst_len), \
+ .burst_max_speed_hz = ADIS16400_SPI_BURST \
}
static const struct adis_timeout adis16300_timeouts = {
--
2.31.1
next prev parent reply other threads:[~2021-04-22 10:17 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 10:19 [PATCH v2 0/9] Adis IRQ fixes and minor improvements Nuno Sa
2021-04-22 10:19 ` [PATCH v2 1/9] iio: adis_buffer: do not return ints in irq handlers Nuno Sa
2021-04-24 10:59 ` Jonathan Cameron
2021-04-22 10:19 ` [PATCH v2 2/9] iio: adis16400: " Nuno Sa
2021-04-24 11:00 ` Jonathan Cameron
2021-04-22 10:19 ` [PATCH v2 3/9] iio: adis16475: " Nuno Sa
2021-04-23 6:41 ` Alexandru Ardelean
2021-04-24 11:06 ` Jonathan Cameron
2021-04-26 9:45 ` Sa, Nuno
2021-04-22 10:19 ` [PATCH v2 4/9] iio: adis_buffer: check return value on page change Nuno Sa
2021-04-23 7:14 ` Alexandru Ardelean
2021-04-24 11:07 ` Jonathan Cameron
2021-04-22 10:19 ` [PATCH v2 5/9] iio: adis_buffer: don't push data to buffers on failure Nuno Sa
2021-04-23 7:28 ` Alexandru Ardelean
2021-04-24 11:13 ` Jonathan Cameron
2021-04-22 10:19 ` [PATCH v2 6/9] iio: adis_buffer: update device page after changing it Nuno Sa
2021-04-23 7:32 ` Alexandru Ardelean
2021-04-23 12:20 ` Sa, Nuno
2021-04-23 13:56 ` Alexandru Ardelean
2021-04-24 11:18 ` Jonathan Cameron
2021-04-24 11:19 ` Jonathan Cameron
2021-04-24 11:31 ` Jonathan Cameron
2021-04-26 9:54 ` Sa, Nuno
2021-04-26 9:46 ` Sa, Nuno
2021-04-22 10:19 ` [PATCH v2 7/9] iio: adis: add burst_max_speed_hz variable Nuno Sa
2021-04-23 7:34 ` Alexandru Ardelean
2021-04-24 11:26 ` Jonathan Cameron
2021-04-22 10:19 ` [PATCH v2 8/9] iio: adis16475: do not directly change spi 'max_speed_hz' Nuno Sa
2021-04-23 7:36 ` Alexandru Ardelean
2021-04-22 10:19 ` Nuno Sa [this message]
2021-04-23 7:37 ` [PATCH v2 9/9] iio: adis16400: " Alexandru Ardelean
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=20210422101911.135630-10-nuno.sa@analog.com \
--to=nuno.sa@analog.com \
--cc=Michael.Hennerich@analog.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.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