| Message ID | 20200514085835.80275-1-sergiu.cuciurean@analog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: dac: vf610_dac: Replace indio_dev->mlock with own device lock | expand |
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,
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,
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(-)