Skip to contentSkip to conversation

iio: adc: max1363: replace mlock with own lock

PATCH Superseded Rohit Sarkar 2 participants 3 messages Feb 26, 2020 – Feb 27, 2020 IIO

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: adc: max1363: replace mlock with own lock

This change replaces indio_dev's mlock with the drivers own lock. In each case the lock is needed to protect the driver's own state.

---
 drivers/iio/adc/max1363.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/iio/adc/max1363.c +7 -6
index 5c2cc61b666e..b9557f957f3c 100644
@@ -169,6 +169,7 @@ struct max1363_state {
 	const struct max1363_mode	*current_mode;
 	u32				requestedmask;
 	struct regulator		*reg;
+	struct mutex lock;
 
 	/* Using monitor modes and buffer at the same time is
 	   currently not supported */
@@ -364,7 +365,7 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
 	struct max1363_state *st = iio_priv(indio_dev);
 	struct i2c_client *client = st->client;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->lock);
 	/*
 	 * If monitor mode is enabled, the method for reading a single
 	 * channel will have to be rather different and has not yet
@@ -405,7 +406,7 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
 	}
 	*val = data;
 error_ret:
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->lock);
 	return ret;
 
 }
@@ -705,9 +706,9 @@ static ssize_t max1363_monitor_store_freq(struct device *dev,
 	if (!found)
 		return -EINVAL;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->mlock);
 	st->monitor_speed = i;
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->mlock);
 
 	return 0;
 }
@@ -810,12 +811,12 @@ static int max1363_read_event_config(struct iio_dev *indio_dev,
 	int val;
 	int number = chan->channel;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->mlock);
 	if (dir == IIO_EV_DIR_FALLING)
 		val = (1 << number) & st->mask_low;
 	else
 		val = (1 << number) & st->mask_high;
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->mlock);
 
 	return val;
 }
Signature · 1 line
2.23.0.385.gbc12974a89
#1 lore raw
Quoted 15 lines · Rohit Sarkar

[External]

This change replaces indio_dev's mlock with the drivers own lock. In each case the lock is needed to protect the driver's own state.

---
 drivers/iio/adc/max1363.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/iio/adc/max1363.c +0 -0
index 5c2cc61b666e..b9557f957f3c 100644

drivers/iio/adc/max1363.c struct max1363_state { · line 172

Quoted 4 lines
drivers/iio/adc/max1363.c +1 -0
@@ -169,6 +169,7 @@ struct max1363_state {
 	const struct max1363_mode	*current_mode;
 	u32				requestedmask;
 	struct regulator		*reg;
+	struct mutex lock;

The 'lock' field should be aligned with *reg & requestedmask.

Also, it's a good idea to do a 'mutex_init(&st->lock)' in max1363_probe(). Somewhere after 'st = iio_priv(indio_dev);'

Rest looks good

Quoted 52 lines
drivers/iio/adc/max1363.c +1 -1
 	/* Using monitor modes and buffer at the same time is
 	   currently not supported */
@@ -364,7 +365,7 @@ static int max1363_read_single_chan(struct iio_dev
 *indio_dev,
 	struct max1363_state *st = iio_priv(indio_dev);
 	struct i2c_client *client = st->client;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->lock);
 	/*
 	 * If monitor mode is enabled, the method for reading a single
drivers/iio/adc/max1363.c +1 -1
 	 * channel will have to be rather different and has not yet
@@ -405,7 +406,7 @@ static int max1363_read_single_chan(struct iio_dev
 *indio_dev,
 	}
 	*val = data;
 error_ret:
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->lock);
 	return ret;
 

}

drivers/iio/adc/max1363.c +2 -2
@@ -705,9 +706,9 @@ static ssize_t max1363_monitor_store_freq(struct device
 *dev,
 	if (!found)
 		return -EINVAL;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->mlock);
 	st->monitor_speed = i;
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->mlock);
 
 	return 0;

}

drivers/iio/adc/max1363.c +2 -2
@@ -810,12 +811,12 @@ static int max1363_read_event_config(struct iio_dev
 *indio_dev,
 	int val;
 	int number = chan->channel;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->mlock);
 	if (dir == IIO_EV_DIR_FALLING)
 		val = (1 << number) & st->mask_low;
 	else
 		val = (1 << number) & st->mask_high;
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->mlock);
 
 	return val;

}

#2 lore raw
Quoted 11 lines · Alexandru
Quoted 10 lines · Rohit Sarkar

[External]

This change replaces indio_dev's mlock with the drivers own lock. In each case the lock is needed to protect the driver's own state.

---
 drivers/iio/adc/max1363.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
Quoted 11 lines

drivers/iio/adc/max1363.c struct max1363_state { · line 172

Quoted 9 lines
drivers/iio/adc/max1363.c +1 -0
index 5c2cc61b666e..b9557f957f3c 100644
@@ -169,6 +169,7 @@ struct max1363_state {
 	const struct max1363_mode	*current_mode;
 	u32				requestedmask;
 	struct regulator		*reg;
+	struct mutex lock;

The 'lock' field should be aligned with *reg & requestedmask.

Ah yes, dont know how I missed that.

Quoted 2 lines

Also, it's a good idea to do a 'mutex_init(&st->lock)' in max1363_probe(). Somewhere after 'st = iio_priv(indio_dev);'

Will do

Quoted 2 lines

Rest looks good

Thanks,
Rohit