From: Miquel Raynal <miquel.raynal@bootlin.com>
To: linux-iio@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH 07/10] iio: core: Hide write accesses to iio_dev->currentmode
Date: Wed, 15 Dec 2021 16:13:41 +0100 [thread overview]
Message-ID: <20211215151344.163036-8-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20211215151344.163036-1-miquel.raynal@bootlin.com>
In order to later move this variable within the opaque structure and now
that there is a read-only helper for it, let's create a write helper.
The idea behind these changes is to limit the temptation of using
->currentmode directly, and this will soon be fully addressed by making
the modification to this variable impossible from a device driver by
moving it to the opaque structure. But for now, let's just do a
transparent change and use a new helper when ->currentmode needs to be
accessed for modifications.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
drivers/iio/industrialio-buffer.c | 6 +++---
drivers/iio/industrialio-core.c | 11 +++++++++++
include/linux/iio/iio.h | 1 +
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index f4dbab7c44fa..190f9cc5fb2c 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -1065,7 +1065,7 @@ static int iio_enable_buffers(struct iio_dev *indio_dev,
indio_dev->active_scan_mask = config->scan_mask;
indio_dev->scan_timestamp = config->scan_timestamp;
indio_dev->scan_bytes = config->scan_bytes;
- indio_dev->currentmode = config->mode;
+ iio_set_internal_mode(indio_dev, config->mode);
iio_update_demux(indio_dev);
@@ -1132,7 +1132,7 @@ static int iio_enable_buffers(struct iio_dev *indio_dev,
if (indio_dev->setup_ops->postdisable)
indio_dev->setup_ops->postdisable(indio_dev);
err_undo_config:
- indio_dev->currentmode = INDIO_DIRECT_MODE;
+ iio_set_internal_mode(indio_dev, INDIO_DIRECT_MODE);
indio_dev->active_scan_mask = NULL;
return ret;
@@ -1181,7 +1181,7 @@ static int iio_disable_buffers(struct iio_dev *indio_dev)
iio_free_scan_mask(indio_dev, indio_dev->active_scan_mask);
indio_dev->active_scan_mask = NULL;
- indio_dev->currentmode = INDIO_DIRECT_MODE;
+ iio_set_internal_mode(indio_dev, INDIO_DIRECT_MODE);
return ret;
}
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index a1d6e30d034a..5c7e0c9e1f59 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -2068,6 +2068,17 @@ int iio_get_internal_mode(struct iio_dev *indio_dev)
}
EXPORT_SYMBOL_GPL(iio_get_internal_mode);
+/**
+ * iio_set_internal_mode() - helper function providing write-only access to the
+ * internal @currentmode variable
+ * @indio_dev: IIO device structure for device
+ **/
+void iio_set_internal_mode(struct iio_dev *indio_dev, int mode)
+{
+ indio_dev->currentmode = mode;
+}
+EXPORT_SYMBOL_GPL(iio_set_internal_mode);
+
subsys_initcall(iio_init);
module_exit(iio_exit);
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index dcab17f44552..27551d251904 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -679,6 +679,7 @@ struct iio_trigger *devm_iio_trigger_alloc(struct device *parent,
const char *fmt, ...);
int iio_get_internal_mode(struct iio_dev *indio_dev);
+void iio_set_internal_mode(struct iio_dev *indio_dev, int mode);
/**
* iio_buffer_enabled() - helper function to test if the buffer is enabled
--
2.27.0
next prev parent reply other threads:[~2021-12-15 15:13 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 15:13 [PATCH 00/10] Light core IIO enhancements Miquel Raynal
2021-12-15 15:13 ` [PATCH 01/10] iio: core: Fix the kernel doc regarding the currentmode iio_dev entry Miquel Raynal
2021-12-16 6:23 ` Alexandru Ardelean
2022-01-15 15:47 ` Jonathan Cameron
2021-12-15 15:13 ` [PATCH 02/10] iio: core: Enhance the kernel doc of modes and currentmodes iio_dev entries Miquel Raynal
2021-12-16 6:24 ` Alexandru Ardelean
2021-12-16 8:15 ` Miquel Raynal
2022-01-15 15:51 ` Jonathan Cameron
2022-01-28 14:56 ` Miquel Raynal
2021-12-15 15:13 ` [PATCH 03/10] iio: magnetometer: rm3100: Stop abusing the ->currentmode Miquel Raynal
2021-12-16 6:40 ` Alexandru Ardelean
2021-12-16 8:18 ` Miquel Raynal
2022-01-15 15:58 ` Jonathan Cameron
2022-01-28 15:00 ` Miquel Raynal
2021-12-15 15:13 ` [PATCH 04/10] iio: adc: stm32-dfsdm: Avoid dereferencing ->currentmode Miquel Raynal
2021-12-16 6:47 ` Alexandru Ardelean
2021-12-16 8:22 ` Miquel Raynal
2022-01-15 16:06 ` Jonathan Cameron
2022-01-28 15:04 ` Miquel Raynal
2022-02-01 8:41 ` Fabrice Gasnier
2022-02-02 9:33 ` Miquel Raynal
2021-12-15 15:13 ` [PATCH 05/10] iio: st_sensors: Use iio_device_claim/release_direct_mode() when relevant Miquel Raynal
2021-12-16 7:16 ` Alexandru Ardelean
2021-12-16 8:32 ` Miquel Raynal
2022-01-15 16:38 ` Jonathan Cameron
2021-12-15 15:13 ` [PATCH 06/10] iio: core: Hide read accesses to iio_dev->currentmode Miquel Raynal
2021-12-16 7:38 ` Alexandru Ardelean
2021-12-16 7:41 ` Alexandru Ardelean
2021-12-16 8:37 ` Miquel Raynal
2022-01-15 16:51 ` Jonathan Cameron
2021-12-15 15:13 ` Miquel Raynal [this message]
2022-01-15 16:56 ` [PATCH 07/10] iio: core: Hide write " Jonathan Cameron
2022-02-02 8:16 ` Miquel Raynal
2021-12-15 15:13 ` [PATCH 08/10] iio: core: Move iio_dev->currentmode to the opaque structure Miquel Raynal
2021-12-16 7:48 ` Alexandru Ardelean
2021-12-16 8:38 ` Miquel Raynal
2022-01-15 17:00 ` Jonathan Cameron
2021-12-15 15:13 ` [PATCH 09/10] iio: core: Simplify the registration of kfifo buffers Miquel Raynal
2021-12-16 7:52 ` Alexandru Ardelean
2022-01-15 17:12 ` Jonathan Cameron
2022-02-02 8:09 ` Miquel Raynal
2022-02-05 18:50 ` Jonathan Cameron
2021-12-15 15:13 ` [PATCH 10/10] iio: core: Clarify the modes Miquel Raynal
2022-01-15 17:30 ` Jonathan Cameron
2022-02-02 13:46 ` Miquel Raynal
2022-02-05 18:56 ` Jonathan Cameron
2022-02-06 13:21 ` Miquel Raynal
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=20211215151344.163036-8-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=thomas.petazzoni@bootlin.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;
as well as URLs for NNTP newsgroup(s).