xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: light: isl29125: use iio helper function to guarantee direct mode

Browse Source 
Replace the code that guarantees the device stays in direct mode
with iio_device_claim_direct_mode() which does same.  This allows
removal of an unused lock in the device private global data.

Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Cc: Daniel Baluta <daniel.baluta@gmail.com>
Acked-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Alison Schofield
2016-06-06 22:08:33 -07:00
committed by Jonathan Cameron
parent 95bd363bbc
commit ae148e5107
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/iio/light/isl29125.c
View File

@@ -50,7 +50,6 @@
struct isl29125_data { struct isl29125_data {
struct i2c_client *client; struct i2c_client *client;
struct mutex lock;
u8 conf1; u8 conf1;
u16 buffer[8]; /* 3x 16-bit, padding, 8 bytes timestamp */ u16 buffer[8]; /* 3x 16-bit, padding, 8 bytes timestamp */
}; };
@@ -128,11 +127,11 @@ static int isl29125_read_raw(struct iio_dev *indio_dev,
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_RAW: case IIO_CHAN_INFO_RAW:
if (iio_buffer_enabled(indio_dev)) ret = iio_device_claim_direct_mode(indio_dev);
return -EBUSY; if (ret)
mutex_lock(&data->lock); return ret;
ret = isl29125_read_data(data, chan->scan_index); ret = isl29125_read_data(data, chan->scan_index);
mutex_unlock(&data->lock); iio_device_release_direct_mode(indio_dev);
if (ret < 0) if (ret < 0)
return ret; return ret;
*val = ret; *val = ret;
@@ -259,7 +258,6 @@ static int isl29125_probe(struct i2c_client *client,
data = iio_priv(indio_dev); data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev); i2c_set_clientdata(client, indio_dev);
data->client = client; data->client = client;
mutex_init(&data->lock);
indio_dev->dev.parent = &client->dev; indio_dev->dev.parent = &client->dev;
indio_dev->info = &isl29125_info; indio_dev->info = &isl29125_info;