Skip to contentSkip to conversation

iio: light: gp2ap020a00f: use iio helper function to lock direct mode

PATCH Applied Alison Schofield 3 participants 3 messages Jun 8, 2016 – Jun 11, 2016 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: light: gp2ap020a00f: use iio helper function to lock direct mode

Replace the code that guarantees the device stays in direct mode with iio_device_claim_direct_mode() which does same. Includes a tiny bit of refactoring (single case -> if) and simplified return flow.

---
 drivers/iio/light/gp2ap020a00f.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)
drivers/iio/light/gp2ap020a00f.c +5 -13
index 6d41086..af73af3 100644
@@ -1287,22 +1287,14 @@ static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev,
 	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
 	int err = -EINVAL;
 
-	mutex_lock(&data->lock);
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		if (iio_buffer_enabled(indio_dev)) {
-			err = -EBUSY;
-			goto error_unlock;
-		}
+	if (mask == IIO_CHAN_INFO_RAW) {
+		err = iio_device_claim_direct_mode(indio_dev);
+		if (err)
+			return err;
 
 		err = gp2ap020a00f_read_channel(data, chan, val);
-		break;
+		iio_device_release_direct_mode(indio_dev);
 	}
-
-error_unlock:
-	mutex_unlock(&data->lock);
-
 	return err < 0 ? err : IIO_VAL_INT;
 }
 
Signature · 1 line
2.1.4
Acked-by on v1 1/1
#1 lore raw

Hi Alison,

Quoted 34 lines · Alison Schofield

Replace the code that guarantees the device stays in direct mode with iio_device_claim_direct_mode() which does same. Includes a tiny bit of refactoring (single case -> if) and simplified return flow.

---
  drivers/iio/light/gp2ap020a00f.c | 18 +++++-------------
  1 file changed, 5 insertions(+), 13 deletions(-)
drivers/iio/light/gp2ap020a00f.c +4 -8
index 6d41086..af73af3 100644
@@ -1287,22 +1287,14 @@ static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev,
  	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
  	int err = -EINVAL;
 
-	mutex_lock(&data->lock);
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		if (iio_buffer_enabled(indio_dev)) {
-			err = -EBUSY;
-			goto error_unlock;
-		}
+	if (mask == IIO_CHAN_INFO_RAW) {
+		err = iio_device_claim_direct_mode(indio_dev);
+		if (err)
+			return err;
 
  		err = gp2ap020a00f_read_channel(data, chan, val);

drivers/iio/light/gp2ap020a00f.c static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev, · line 1300

Quoted 10 lines
drivers/iio/light/gp2ap020a00f.c +1 -5
-		break;
+		iio_device_release_direct_mode(indio_dev);
  	}
-
-error_unlock:
-	mutex_unlock(&data->lock);
-
  	return err < 0 ? err : IIO_VAL_INT;
  }
 

Nice patch.

Signature · 2 lines
Best regards,
Jacek Anaszewski
maintainer Applied
#2 lore raw
Quoted 50 lines · Jacek Anaszewski

Hi Alison,

Quoted 34 lines · Alison Schofield

Replace the code that guarantees the device stays in direct mode with iio_device_claim_direct_mode() which does same. Includes a tiny bit of refactoring (single case -> if) and simplified return flow.

---
  drivers/iio/light/gp2ap020a00f.c | 18 +++++-------------
  1 file changed, 5 insertions(+), 13 deletions(-)
drivers/iio/light/gp2ap020a00f.c +4 -8
index 6d41086..af73af3 100644
@@ -1287,22 +1287,14 @@ static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev,
      struct gp2ap020a00f_data *data = iio_priv(indio_dev);
      int err = -EINVAL;
 
-    mutex_lock(&data->lock);
-
-    switch (mask) {
-    case IIO_CHAN_INFO_RAW:
-        if (iio_buffer_enabled(indio_dev)) {
-            err = -EBUSY;
-            goto error_unlock;
-        }
+    if (mask == IIO_CHAN_INFO_RAW) {
+        err = iio_device_claim_direct_mode(indio_dev);
+        if (err)
+            return err;
 
          err = gp2ap020a00f_read_channel(data, chan, val);

drivers/iio/light/gp2ap020a00f.c static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev, · line 1300

Quoted 10 lines
drivers/iio/light/gp2ap020a00f.c +1 -5
-        break;
+        iio_device_release_direct_mode(indio_dev);
      }
-
-error_unlock:
-    mutex_unlock(&data->lock);
-
      return err < 0 ? err : IIO_VAL_INT;
  }
 

Nice patch.

Quoted 1 line

Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it.

I would have slightly preferred the patch to not change the case to an if (as really a slightly separate cleanup from the main target of the patch).

Good changes though!

Thanks,

Jonathan
Thanks,

Jonathan

Quoted 1 line