* [PATCH] iio: dac: vf610_dac: Replace indio_dev->mlock with own device lock
@ 2020-05-14 8:58 Sergiu Cuciurean
2020-05-16 15:36 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Sergiu Cuciurean @ 2020-05-14 8:58 UTC (permalink / raw)
To: linux-kernel, linux-iio
Cc: Sergiu Cuciurean, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, Kate Stewart,
Thomas Gleixner, Alexandru Ardelean, Greg Kroah-Hartman
As part of the general cleanup of indio_dev->mlock, this change replaces
it with a local lock on the device's state structure.
Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
---
drivers/iio/dac/vf610_dac.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/dac/vf610_dac.c b/drivers/iio/dac/vf610_dac.c
index 71f8a5c471c4..c1e15ede0e8e 100644
--- a/drivers/iio/dac/vf610_dac.c
+++ b/drivers/iio/dac/vf610_dac.c
@@ -36,6 +36,7 @@ struct vf610_dac {
struct device *dev;
enum vf610_conversion_mode_sel conv_mode;
void __iomem *regs;
+ struct mutex lock;
};
static void vf610_dac_init(struct vf610_dac *info)
@@ -64,7 +65,7 @@ static int vf610_set_conversion_mode(struct iio_dev *indio_dev,
struct vf610_dac *info = iio_priv(indio_dev);
int val;
- mutex_lock(&indio_dev->mlock);
+ mutex_lock(&info->lock);
info->conv_mode = mode;
val = readl(info->regs + VF610_DACx_STATCTRL);
if (mode)
@@ -72,7 +73,7 @@ static int vf610_set_conversion_mode(struct iio_dev *indio_dev,
else
val &= ~VF610_DAC_LPEN;
writel(val, info->regs + VF610_DACx_STATCTRL);
- mutex_unlock(&indio_dev->mlock);
+ mutex_unlock(&info->lock);
return 0;
}
@@ -147,9 +148,9 @@ static int vf610_write_raw(struct iio_dev *indio_dev,
switch (mask) {
case IIO_CHAN_INFO_RAW:
- mutex_lock(&indio_dev->mlock);
+ mutex_lock(&info->lock);
writel(VF610_DAC_DAT0(val), info->regs);
- mutex_unlock(&indio_dev->mlock);
+ mutex_unlock(&info->lock);
return 0;
default:
@@ -205,6 +206,8 @@ static int vf610_dac_probe(struct platform_device *pdev)
indio_dev->channels = vf610_dac_iio_channels;
indio_dev->num_channels = ARRAY_SIZE(vf610_dac_iio_channels);
+ mutex_init(&info->lock);
+
ret = clk_prepare_enable(info->clk);
if (ret) {
dev_err(&pdev->dev,
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] iio: dac: vf610_dac: Replace indio_dev->mlock with own device lock
2020-05-14 8:58 [PATCH] iio: dac: vf610_dac: Replace indio_dev->mlock with own device lock Sergiu Cuciurean
@ 2020-05-16 15:36 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2020-05-16 15:36 UTC (permalink / raw)
To: Sergiu Cuciurean
Cc: linux-kernel, linux-iio, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, Kate Stewart, Thomas Gleixner,
Alexandru Ardelean, Greg Kroah-Hartman
On Thu, 14 May 2020 11:58:15 +0300
Sergiu Cuciurean <sergiu.cuciurean@analog.com> wrote:
> As part of the general cleanup of indio_dev->mlock, this change replaces
> it with a local lock on the device's state structure.
>
> Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Applied, thanks,
Jonathan
> ---
> drivers/iio/dac/vf610_dac.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/dac/vf610_dac.c b/drivers/iio/dac/vf610_dac.c
> index 71f8a5c471c4..c1e15ede0e8e 100644
> --- a/drivers/iio/dac/vf610_dac.c
> +++ b/drivers/iio/dac/vf610_dac.c
> @@ -36,6 +36,7 @@ struct vf610_dac {
> struct device *dev;
> enum vf610_conversion_mode_sel conv_mode;
> void __iomem *regs;
> + struct mutex lock;
> };
>
> static void vf610_dac_init(struct vf610_dac *info)
> @@ -64,7 +65,7 @@ static int vf610_set_conversion_mode(struct iio_dev *indio_dev,
> struct vf610_dac *info = iio_priv(indio_dev);
> int val;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&info->lock);
> info->conv_mode = mode;
> val = readl(info->regs + VF610_DACx_STATCTRL);
> if (mode)
> @@ -72,7 +73,7 @@ static int vf610_set_conversion_mode(struct iio_dev *indio_dev,
> else
> val &= ~VF610_DAC_LPEN;
> writel(val, info->regs + VF610_DACx_STATCTRL);
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&info->lock);
>
> return 0;
> }
> @@ -147,9 +148,9 @@ static int vf610_write_raw(struct iio_dev *indio_dev,
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&info->lock);
> writel(VF610_DAC_DAT0(val), info->regs);
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&info->lock);
> return 0;
>
> default:
> @@ -205,6 +206,8 @@ static int vf610_dac_probe(struct platform_device *pdev)
> indio_dev->channels = vf610_dac_iio_channels;
> indio_dev->num_channels = ARRAY_SIZE(vf610_dac_iio_channels);
>
> + mutex_init(&info->lock);
> +
> ret = clk_prepare_enable(info->clk);
> if (ret) {
> dev_err(&pdev->dev,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-16 15:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-14 8:58 [PATCH] iio: dac: vf610_dac: Replace indio_dev->mlock with own device lock Sergiu Cuciurean
2020-05-16 15:36 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox