From: Jonathan Cameron <jic23@kernel.org>
To: "Nuno Sá" <nuno.sa@analog.com>
Cc: <linux-amlogic@lists.infradead.org>, <linux-imx@nxp.com>,
<linux-iio@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-rockchip@lists.infradead.org>,
Heiko Stuebner <heiko@sntech.de>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Shawn Guo <shawnguo@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Jyoti Bhayana <jbhayana@google.com>,
Hans de Goede <hdegoede@redhat.com>,
Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Cixi Geng <cixi.geng1@unisoc.com>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
Ciprian Regus <ciprian.regus@analog.com>,
Fabio Estevam <festevam@gmail.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Alexandru Ardelean <aardelean@deviqon.com>,
Florian Boor <florian.boor@kernelconcepts.de>,
Michael Hennerich <Michael.Hennerich@analog.com>,
Orson Zhai <orsonzhai@gmail.com>, Chen-Yu Tsai <wens@csie.org>,
Chunyan Zhang <zhang.lyra@gmail.com>,
Vladimir Zapolskiy <vz@mleia.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Haibo Chen <haibo.chen@nxp.com>,
Kevin Hilman <khilman@baylibre.com>
Subject: Re: [PATCH v2 08/16] iio: adc: sc27xx_adc: do not use internal iio_dev lock
Date: Sun, 9 Oct 2022 13:05:14 +0100 [thread overview]
Message-ID: <20221009130514.133eff43@jic23-huawei> (raw)
In-Reply-To: <20221004134909.1692021-9-nuno.sa@analog.com>
On Tue, 4 Oct 2022 15:49:01 +0200
Nuno Sá <nuno.sa@analog.com> wrote:
> The iio_device lock is only meant for internal use. Hence define a
> device local lock to protect against concurrent accesses.
>
> While at it, properly include "mutex.h" for mutex related APIs.
>
> Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Applied. Pushed out as testing for now, will rebase after rc1.
Thanks,
J
> ---
> drivers/iio/adc/sc27xx_adc.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/sc27xx_adc.c b/drivers/iio/adc/sc27xx_adc.c
> index f8421cbba8fa..ff1fc329bb9b 100644
> --- a/drivers/iio/adc/sc27xx_adc.c
> +++ b/drivers/iio/adc/sc27xx_adc.c
> @@ -4,6 +4,7 @@
> #include <linux/hwspinlock.h>
> #include <linux/iio/iio.h>
> #include <linux/module.h>
> +#include <linux/mutex.h>
> #include <linux/nvmem-consumer.h>
> #include <linux/of.h>
> #include <linux/of_device.h>
> @@ -83,6 +84,8 @@ struct sc27xx_adc_data {
> struct device *dev;
> struct regulator *volref;
> struct regmap *regmap;
> + /* lock to protect against multiple access to the device */
> + struct mutex lock;
> /*
> * One hardware spinlock to synchronize between the multiple
> * subsystems which will access the unique ADC controller.
> @@ -664,9 +667,9 @@ static int sc27xx_adc_read_raw(struct iio_dev *indio_dev,
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&data->lock);
> ret = sc27xx_adc_read(data, chan->channel, scale, &tmp);
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&data->lock);
>
> if (ret)
> return ret;
> @@ -675,10 +678,10 @@ static int sc27xx_adc_read_raw(struct iio_dev *indio_dev,
> return IIO_VAL_INT;
>
> case IIO_CHAN_INFO_PROCESSED:
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&data->lock);
> ret = sc27xx_adc_read_processed(data, chan->channel, scale,
> &tmp);
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&data->lock);
>
> if (ret)
> return ret;
> @@ -934,6 +937,9 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
> indio_dev->info = &sc27xx_info;
> indio_dev->channels = sc27xx_channels;
> indio_dev->num_channels = ARRAY_SIZE(sc27xx_channels);
> +
> + mutex_init(&sc27xx_data->lock);
> +
> ret = devm_iio_device_register(dev, indio_dev);
> if (ret)
> dev_err(dev, "could not register iio (ADC)");
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2022-10-09 12:05 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 13:48 [PATCH v2 00/16] Make 'mlock' really private Nuno Sá
2022-10-04 13:48 ` [PATCH v2 01/16] iio: adc: ad799x: do not use internal iio_dev lock Nuno Sá
2022-10-09 11:53 ` Jonathan Cameron
2022-10-04 13:48 ` [PATCH v2 02/16] iio: adc: axp288_adc: " Nuno Sá
2022-10-09 11:55 ` Jonathan Cameron
2022-10-04 13:48 ` [PATCH v2 03/16] iio: adc: imx7d_adc: " Nuno Sá
2022-10-09 2:00 ` Bough Chen
2022-10-09 11:56 ` Jonathan Cameron
2022-10-04 13:48 ` [PATCH v2 04/16] iio: adc: lpc32xx_adc: " Nuno Sá
2022-10-09 11:57 ` Jonathan Cameron
2022-10-04 13:48 ` [PATCH v2 05/16] iio: adc: ltc2947-core: " Nuno Sá
2022-10-09 11:58 ` Jonathan Cameron
2022-10-04 13:48 ` [PATCH v2 06/16] iio: adc: meson_saradc: " Nuno Sá
2022-10-09 12:01 ` Jonathan Cameron
2022-10-04 13:49 ` [PATCH v2 07/16] iio: adc: rockchip_saradc: " Nuno Sá
2022-10-05 7:44 ` Heiko Stübner
2022-10-09 12:03 ` Jonathan Cameron
2022-10-04 13:49 ` [PATCH v2 08/16] iio: adc: sc27xx_adc: " Nuno Sá
2022-10-09 12:05 ` Jonathan Cameron [this message]
2022-10-04 13:49 ` [PATCH v2 09/16] iio: adc: vf610_adc: add helper function to read samples Nuno Sá
2022-10-09 2:10 ` Bough Chen
2022-10-04 13:49 ` [PATCH v2 10/16] iio: adc: vf610_adc: vf610_adc: do not use internal iio_dev lock Nuno Sá
2022-10-09 2:10 ` Bough Chen
2022-10-04 13:49 ` [PATCH v2 11/16] iio: common: scmi_iio: " Nuno Sá
2022-10-09 12:09 ` Jonathan Cameron
2022-10-04 13:49 ` [PATCH v2 12/16] iio: gyro: itg3200_core: " Nuno Sá
2022-10-09 12:10 ` Jonathan Cameron
2022-10-04 13:49 ` [PATCH v2 13/16] iio: core: introduce iio_device_{claim|release}_buffer_mode() APIs Nuno Sá
2022-10-04 14:08 ` Andy Shevchenko
2022-10-05 8:37 ` Nuno Sá
2022-10-09 11:41 ` Jonathan Cameron
2022-10-10 7:03 ` Nuno Sá
2022-10-04 13:49 ` [PATCH v2 14/16] iio: health: max30100: do not use internal iio_dev lock Nuno Sá
2022-10-04 14:13 ` Andy Shevchenko
2022-10-05 8:09 ` Nuno Sá
2022-10-09 12:14 ` Jonathan Cameron
2022-10-04 13:49 ` [PATCH v2 15/16] iio: health: max30102: " Nuno Sá
2022-10-04 14:15 ` Andy Shevchenko
2022-10-05 8:17 ` Nuno Sá
2022-10-09 11:44 ` Jonathan Cameron
2022-10-09 12:16 ` Jonathan Cameron
2022-10-10 7:08 ` Nuno Sá
2022-10-04 13:49 ` [PATCH v2 16/16] iio: core: move 'mlock' to 'struct iio_dev_opaque' Nuno Sá
2022-10-04 14:21 ` Andy Shevchenko
2022-10-05 8:40 ` Nuno Sá
2022-10-09 11:48 ` Jonathan Cameron
2022-10-09 11:52 ` Jonathan Cameron
2022-10-10 8:30 ` Andy Shevchenko
2022-10-09 12:19 ` Jonathan Cameron
2022-10-10 7:11 ` Nuno Sá
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=20221009130514.133eff43@jic23-huawei \
--to=jic23@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=aardelean@deviqon.com \
--cc=andriy.tryshnivskyy@opensynergy.com \
--cc=andy.shevchenko@gmail.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=ciprian.regus@analog.com \
--cc=cixi.geng1@unisoc.com \
--cc=festevam@gmail.com \
--cc=florian.boor@kernelconcepts.de \
--cc=haibo.chen@nxp.com \
--cc=hdegoede@redhat.com \
--cc=heiko@sntech.de \
--cc=jbhayana@google.com \
--cc=jbrunet@baylibre.com \
--cc=kernel@pengutronix.de \
--cc=khilman@baylibre.com \
--cc=lars@metafoo.de \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-rockchip@lists.infradead.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=miquel.raynal@bootlin.com \
--cc=narmstrong@baylibre.com \
--cc=nuno.sa@analog.com \
--cc=orsonzhai@gmail.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=vz@mleia.com \
--cc=wens@csie.org \
--cc=zhang.lyra@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;
as well as URLs for NNTP newsgroup(s).