Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20221004134909.1692021-12-nuno.sa@analog.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Nuno Sá and committed by
Jonathan Cameron
d711a5a7 4e15cad8

+7 -2
+7 -2
drivers/iio/common/scmi_sensors/scmi_iio.c
··· 15 15 #include <linux/kernel.h> 16 16 #include <linux/kthread.h> 17 17 #include <linux/module.h> 18 + #include <linux/mutex.h> 18 19 #include <linux/scmi_protocol.h> 19 20 #include <linux/time.h> 20 21 #include <linux/types.h> ··· 28 27 struct scmi_protocol_handle *ph; 29 28 const struct scmi_sensor_info *sensor_info; 30 29 struct iio_dev *indio_dev; 30 + /* lock to protect against multiple access to the device */ 31 + struct mutex lock; 31 32 /* adding one additional channel for timestamp */ 32 33 s64 iio_buf[SCMI_IIO_NUM_OF_AXIS + 1]; 33 34 struct notifier_block sensor_update_nb; ··· 201 198 struct iio_chan_spec const *chan, int val, 202 199 int val2, long mask) 203 200 { 201 + struct scmi_iio_priv *sensor = iio_priv(iio_dev); 204 202 int err; 205 203 206 204 switch (mask) { 207 205 case IIO_CHAN_INFO_SAMP_FREQ: 208 - mutex_lock(&iio_dev->mlock); 206 + mutex_lock(&sensor->lock); 209 207 err = scmi_iio_set_odr_val(iio_dev, val, val2); 210 - mutex_unlock(&iio_dev->mlock); 208 + mutex_unlock(&sensor->lock); 211 209 return err; 212 210 default: 213 211 return -EINVAL; ··· 590 586 sensor->sensor_info = sensor_info; 591 587 sensor->sensor_update_nb.notifier_call = scmi_iio_sensor_update_cb; 592 588 sensor->indio_dev = iiodev; 589 + mutex_init(&sensor->lock); 593 590 594 591 /* adding one additional channel for timestamp */ 595 592 iiodev->num_channels = sensor_info->num_axis + 1;