From: Jonathan Cameron <jic23@kernel.org>
To: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-iio@vger.kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Kate Stewart <kstewart@linuxfoundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Alexandru Ardelean <alexandru.ardelean@analog.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH] iio: dac: vf610_dac: Replace indio_dev->mlock with own device lock
Date: Sat, 16 May 2020 16:36:47 +0100 [thread overview]
Message-ID: <20200516163647.5e3b7415@archlinux> (raw)
In-Reply-To: <20200514085835.80275-1-sergiu.cuciurean@analog.com>
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,
prev parent reply other threads:[~2020-05-16 15:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20200516163647.5e3b7415@archlinux \
--to=jic23@kernel.org \
--cc=alexandru.ardelean@analog.com \
--cc=gregkh@linuxfoundation.org \
--cc=knaack.h@gmx.de \
--cc=kstewart@linuxfoundation.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=sergiu.cuciurean@analog.com \
--cc=tglx@linutronix.de \
/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