iio: light: tcs3472: use iio helper function to guarantee direct mode
PATCH 1/1 iio: light: tcs3472: use iio helper function to guarantee direct mode
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.
--- drivers/iio/light/tcs3472.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/iio/light/tcs3472.c +5 -8
@@ -52,7 +52,6 @@struct tcs3472_data {struct i2c_client *client; -struct mutex lock;u8 enable;u8 control;u8 atime;
@@ -117,17 +116,16 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,switch (mask) {case IIO_CHAN_INFO_RAW : -if (iio_buffer_enabled (indio_dev)) -return -EBUSY ; - -mutex_lock (&data->lock); + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret; ret =tcs3472_req_data (data);if (ret <0 ) { -mutex_unlock (&data->lock); +iio_device_release_direct_mode (indio_dev);return ret; } ret =i2c_smbus_read_word_data (data->client, chan->address); -mutex_unlock (&data->lock); +iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; *val = ret;
@@ -263,7 +261,6 @@ static int tcs3472_probe(struct i2c_client *client, data =iio_priv (indio_dev);i2c_set_clientdata (client, indio_dev); data->client = client; -mutex_init (&data->lock); indio_dev->dev.parent = &client->dev; indio_dev->info = &tcs3472_info;
Signature · 1 line
2.1.4
Quoted 3 lines · Alison Schofield
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.
Quoted 50 lines
Signed-off-by Alison Schofield <[email protected]>Cc Daniel Baluta <[email protected]>--- drivers/iio/light/tcs3472.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)drivers/iio/light/tcs3472.c +5
-8@@ -52,7 +52,6 @@struct tcs3472_data {struct i2c_client *client; -struct mutex lock;u8 enable;u8 control;u8 atime;@@ -117,17 +116,16 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,switch (mask) {case IIO_CHAN_INFO_RAW : -if (iio_buffer_enabled (indio_dev)) -return -EBUSY ; - -mutex_lock (&data->lock); + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret; ret =tcs3472_req_data (data);if (ret <0 ) { -mutex_unlock (&data->lock); +iio_device_release_direct_mode (indio_dev);return ret; } ret =i2c_smbus_read_word_data (data->client, chan->address); -mutex_unlock (&data->lock); +iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; *val = ret;@@ -263,7 +261,6 @@ static int tcs3472_probe(struct i2c_client *client, data =iio_priv (indio_dev);i2c_set_clientdata (client, indio_dev); data->client = client; -mutex_init (&data->lock); indio_dev->dev.parent = &client->dev; indio_dev->info = &tcs3472_info;
Signature · 2 lines
Peter Meerwald-Stadler +43-664-2444418 (mobile)
Jonathan Cameron
maintainerQuoted 10 lines · Peter Meerwald-Stadler
Quoted 3 lines · Alison Schofield
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.Quoted 2 lines
Signed-off-by Alison Schofield <[email protected]>Cc Daniel Baluta <[email protected]>
There is an ever so slightly difference in how these all work after the change. They will return -EBUSY rather than holding then returning a valid value under the circumstances of two reads coming through sysfs at the same time. This is a pretty obscure case so
I think we are OK with this.
Actually pending responses to this, I'm going to back out the other two similar patches. Just goes to show, that if you show someone something 3 times they might finally notice the issue!
Quoted 49 lines
Quoted 48 lines
--- drivers/iio/light/tcs3472.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)drivers/iio/light/tcs3472.c +5
-8@@ -52,7 +52,6 @@struct tcs3472_data {struct i2c_client *client; -struct mutex lock;u8 enable;u8 control;u8 atime;@@ -117,17 +116,16 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,switch (mask) {case IIO_CHAN_INFO_RAW : -if (iio_buffer_enabled (indio_dev)) -return -EBUSY ; - -mutex_lock (&data->lock); + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret; ret =tcs3472_req_data (data);if (ret <0 ) { -mutex_unlock (&data->lock); +iio_device_release_direct_mode (indio_dev);return ret; } ret =i2c_smbus_read_word_data (data->client, chan->address); -mutex_unlock (&data->lock); +iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; *val = ret;@@ -263,7 +261,6 @@ static int tcs3472_probe(struct i2c_client *client, data =iio_priv (indio_dev);i2c_set_clientdata (client, indio_dev); data->client = client; -mutex_init (&data->lock); indio_dev->dev.parent = &client->dev; indio_dev->info = &tcs3472_info;
Quoted 17 lines · Jonathan Cameron
Quoted 10 lines · Peter Meerwald-Stadler
Quoted 3 lines · Alison Schofield
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.Quoted 2 lines
Signed-off-by Alison Schofield <[email protected]>Cc Daniel Baluta <[email protected]>There is an ever so slightly difference in how these all work after the change. They will return
-EBUSYrather than holding then returning a valid value under the circumstances of two reads coming through sysfs at the same time. This is a pretty obscure case so
I think we are OK with this.
Quoted 3 lines
Actually pending responses to this, I'm going to back out the other two similar patches. Just goes to show, that if you show someone something 3 times they might finally notice the issue!
Looking at this more carefully the lack of locking around the buffer in use check was clearly broken and your new code fixes both that and allows the lock removal.
I was overthinking this...
Applied
Quoted 57 lines
Quoted 47 lines
Quoted 47 lines
--- drivers/iio/light/tcs3472.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)drivers/iio/light/tcs3472.c +5
-8@@ -52,7 +52,6 @@struct tcs3472_data {struct i2c_client *client; -struct mutex lock;u8 enable;u8 control;u8 atime;@@ -117,17 +116,16 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,switch (mask) {case IIO_CHAN_INFO_RAW : -if (iio_buffer_enabled (indio_dev)) -return -EBUSY ; - -mutex_lock (&data->lock); + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret; ret =tcs3472_req_data (data);if (ret <0 ) { -mutex_unlock (&data->lock); +iio_device_release_direct_mode (indio_dev);return ret; } ret =i2c_smbus_read_word_data (data->client, chan->address); -mutex_unlock (&data->lock); +iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; *val = ret;@@ -263,7 +261,6 @@ static int tcs3472_probe(struct i2c_client *client, data =iio_priv (indio_dev);i2c_set_clientdata (client, indio_dev); data->client = client; -mutex_init (&data->lock);Quoted 4 lines
drivers/iio/light/tcs3472.c static int tcs3472_probe(struct i2c_client *client, · line 266
Quoted 3 lines
drivers/iio/light/tcs3472.c +0
-0indio_dev->dev.parent = &client->dev; indio_dev->info = &tcs3472_info;--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html