Commit d711a5a7 authored by Nuno Sá's avatar Nuno Sá Committed by Jonathan Cameron

iio: common: scmi_iio: do not use internal iio_dev lock

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: default avatarNuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20221004134909.1692021-12-nuno.sa@analog.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 4e15cad8
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h>
#include <linux/scmi_protocol.h> #include <linux/scmi_protocol.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -27,6 +28,8 @@ struct scmi_iio_priv { ...@@ -27,6 +28,8 @@ struct scmi_iio_priv {
struct scmi_protocol_handle *ph; struct scmi_protocol_handle *ph;
const struct scmi_sensor_info *sensor_info; const struct scmi_sensor_info *sensor_info;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
/* lock to protect against multiple access to the device */
struct mutex lock;
/* adding one additional channel for timestamp */ /* adding one additional channel for timestamp */
s64 iio_buf[SCMI_IIO_NUM_OF_AXIS + 1]; s64 iio_buf[SCMI_IIO_NUM_OF_AXIS + 1];
struct notifier_block sensor_update_nb; struct notifier_block sensor_update_nb;
...@@ -198,13 +201,14 @@ static int scmi_iio_write_raw(struct iio_dev *iio_dev, ...@@ -198,13 +201,14 @@ static int scmi_iio_write_raw(struct iio_dev *iio_dev,
struct iio_chan_spec const *chan, int val, struct iio_chan_spec const *chan, int val,
int val2, long mask) int val2, long mask)
{ {
struct scmi_iio_priv *sensor = iio_priv(iio_dev);
int err; int err;
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_SAMP_FREQ: case IIO_CHAN_INFO_SAMP_FREQ:
mutex_lock(&iio_dev->mlock); mutex_lock(&sensor->lock);
err = scmi_iio_set_odr_val(iio_dev, val, val2); err = scmi_iio_set_odr_val(iio_dev, val, val2);
mutex_unlock(&iio_dev->mlock); mutex_unlock(&sensor->lock);
return err; return err;
default: default:
return -EINVAL; return -EINVAL;
...@@ -586,6 +590,7 @@ scmi_alloc_iiodev(struct scmi_device *sdev, ...@@ -586,6 +590,7 @@ scmi_alloc_iiodev(struct scmi_device *sdev,
sensor->sensor_info = sensor_info; sensor->sensor_info = sensor_info;
sensor->sensor_update_nb.notifier_call = scmi_iio_sensor_update_cb; sensor->sensor_update_nb.notifier_call = scmi_iio_sensor_update_cb;
sensor->indio_dev = iiodev; sensor->indio_dev = iiodev;
mutex_init(&sensor->lock);
/* adding one additional channel for timestamp */ /* adding one additional channel for timestamp */
iiodev->num_channels = sensor_info->num_axis + 1; iiodev->num_channels = sensor_info->num_axis + 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment