From: Alexandru Ardelean <alexandru.ardelean@analog.com> To: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org> Cc: <jic23@kernel.org>, <kgene@kernel.org>, <krzk@kernel.org>, "Sergiu Cuciurean" <sergiu.cuciurean@analog.com>, Alexandru Ardelean <alexandru.ardelean@analog.com> Subject: [PATCH] iio: adc: exynos_adc: Replace indio_dev->mlock with own device lock Date: Wed, 26 Aug 2020 16:22:03 +0300 [thread overview] Message-ID: <20200826132203.236748-1-alexandru.ardelean@analog.com> (raw) From: Sergiu Cuciurean <sergiu.cuciurean@analog.com> As part of the general cleanup of indio_dev->mlock, this change replaces it with a local lock, to protect potential concurrent access to the completion callback during a conversion. Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> --- drivers/iio/adc/exynos_adc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c index 7d23b6c33284..6a49f8dfab22 100644 --- a/drivers/iio/adc/exynos_adc.c +++ b/drivers/iio/adc/exynos_adc.c @@ -132,6 +132,8 @@ struct exynos_adc { struct completion completion; + struct mutex lock; + u32 value; unsigned int version; @@ -542,7 +544,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev, return -EINVAL; } - mutex_lock(&indio_dev->mlock); + mutex_lock(&info->lock); reinit_completion(&info->completion); /* Select the channel to be used and Trigger conversion */ @@ -562,7 +564,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev, ret = IIO_VAL_INT; } - mutex_unlock(&indio_dev->mlock); + mutex_unlock(&info->lock); return ret; } @@ -573,7 +575,7 @@ static int exynos_read_s3c64xx_ts(struct iio_dev *indio_dev, int *x, int *y) unsigned long timeout; int ret; - mutex_lock(&indio_dev->mlock); + mutex_lock(&info->lock); info->read_ts = true; reinit_completion(&info->completion); @@ -598,7 +600,7 @@ static int exynos_read_s3c64xx_ts(struct iio_dev *indio_dev, int *x, int *y) } info->read_ts = false; - mutex_unlock(&indio_dev->mlock); + mutex_unlock(&info->lock); return ret; } @@ -872,6 +874,8 @@ static int exynos_adc_probe(struct platform_device *pdev) indio_dev->channels = exynos_adc_iio_channels; indio_dev->num_channels = info->data->num_channels; + mutex_init(&info->lock); + ret = request_irq(info->irq, exynos_adc_isr, 0, dev_name(&pdev->dev), info); if (ret < 0) { -- 2.25.1
next reply other threads:[~2020-08-26 13:22 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-26 13:22 Alexandru Ardelean [this message] 2020-08-27 6:56 ` Krzysztof Kozlowski 2020-08-27 8:53 ` Alexandru Ardelean 2020-08-29 15:33 ` Jonathan Cameron 2020-08-29 15:35 ` Jonathan Cameron 2020-09-16 9:31 ` [PATCH v2] " Alexandru Ardelean 2020-09-19 15:19 ` 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=20200826132203.236748-1-alexandru.ardelean@analog.com \ --to=alexandru.ardelean@analog.com \ --cc=jic23@kernel.org \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=sergiu.cuciurean@analog.com \ --subject='Re: [PATCH] iio: adc: exynos_adc: Replace indio_dev->mlock with own device lock' \ /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
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).