瀏覽代碼

iio: chemical: atlas-ph-sensor: switch to iio_device_*_direct_mode helpers

Signed-off-by: Matt Ranostay <mranostay@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Matt Ranostay 9 年之前
父節點
當前提交
b015b3e321
共有 1 個文件被更改,包括 5 次插入7 次删除
  1. 5 7
      drivers/iio/chemical/atlas-ph-sensor.c

+ 5 - 7
drivers/iio/chemical/atlas-ph-sensor.c

@@ -402,15 +402,13 @@ static int atlas_read_raw(struct iio_dev *indio_dev,
 		case IIO_PH:
 		case IIO_PH:
 		case IIO_CONCENTRATION:
 		case IIO_CONCENTRATION:
 		case IIO_ELECTRICALCONDUCTIVITY:
 		case IIO_ELECTRICALCONDUCTIVITY:
-			mutex_lock(&indio_dev->mlock);
+			ret = iio_device_claim_direct_mode(indio_dev);
+			if (ret)
+				return ret;
 
 
-			if (iio_buffer_enabled(indio_dev))
-				ret = -EBUSY;
-			else
-				ret = atlas_read_measurement(data,
-							chan->address, &reg);
+			ret = atlas_read_measurement(data, chan->address, &reg);
 
 
-			mutex_unlock(&indio_dev->mlock);
+			iio_device_release_direct_mode(indio_dev);
 			break;
 			break;
 		default:
 		default:
 			ret = -EINVAL;
 			ret = -EINVAL;