Skip to contentSkip to conversation

iio: Place drivers on standby on error

PATCH In review Cristina Opriceana 2 participants 4 messages Mar 29, 2015 IIO

lore
Share & tools
lore

Cristina Opriceana

author
#0 lore raw

cover iio: Place drivers on standby on error

This patchset places drivers on standby when an error occurs.

I know these don't belong to the staging area, but I need a review before sending them.

Cristina Opriceana (2):
iio: magnetometer: mag3110: Place driver on standby on error
iio: light: ltr501: Powerdown device on error

 drivers/iio/light/ltr501.c         | 19 ++++++++++---------
 drivers/iio/magnetometer/mag3110.c | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/2 iio: magnetometer: mag3110.c: Place driver on standby on error

Place driver on standby mode on error in order to prevent wasting power. Move standby function above to be seen by the new call.

Signed-off-by Cristina Opriceana <[email protected]>
---
 drivers/iio/magnetometer/mag3110.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/iio/magnetometer/mag3110.c +10 -8
index e3106b4..261d517 100644
@@ -321,6 +321,12 @@ static const struct iio_info mag3110_info = {
 
 static const unsigned long mag3110_scan_masks[] = {0x7, 0xf, 0};
 
+static int mag3110_standby(struct mag3110_data *data)
+{
+	return i2c_smbus_write_byte_data(data->client, MAG3110_CTRL_REG1,
+		data->ctrl_reg1 & ~MAG3110_CTRL_AC);
+}
+
 static int mag3110_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {

@@ -360,12 +366,12 @@ static int mag3110_probe(struct i2c_client *client,
 	ret = i2c_smbus_write_byte_data(client, MAG3110_CTRL_REG2,
 		MAG3110_CTRL_AUTO_MRST_EN);
 	if (ret < 0)
-		return ret;
+		goto standby_on_error;
 
 	ret = iio_triggered_buffer_setup(indio_dev, NULL,
 		mag3110_trigger_handler, NULL);
 	if (ret < 0)
-		return ret;
+		goto standby_on_error;
 
 	ret = iio_device_register(indio_dev);
 	if (ret < 0)

@@ -374,15 +380,11 @@ static int mag3110_probe(struct i2c_client *client,
 
 buffer_cleanup:
 	iio_triggered_buffer_cleanup(indio_dev);
+standby_on_error:
+	mag3110_standby(iio_priv(indio_dev));
 	return ret;
 }
 
-static int mag3110_standby(struct mag3110_data *data)
-{
-	return i2c_smbus_write_byte_data(data->client, MAG3110_CTRL_REG1,
-		data->ctrl_reg1 & ~MAG3110_CTRL_AC);
-}
-
 static int mag3110_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/2 iio: light: ltr501: Powerdown device on error

In reply to Cristina Opriceana

Power down device when an error occurs in order to avoid wasting power. Also move powerdown function up to be seen by the new call.

Signed-off-by Cristina Opriceana <[email protected]>
---
 drivers/iio/light/ltr501.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/iio/light/ltr501.c +10 -9
index 62b7072..34f41e3 100644
@@ -333,6 +333,13 @@ static int ltr501_init(struct ltr501_data *data)
 		data->ps_contr);
 }
 
+static int ltr501_powerdown(struct ltr501_data *data)
+{
+	return ltr501_write_contr(data->client,
+		data->als_contr & ~LTR501_CONTR_ACTIVE,
+		data->ps_contr & ~LTR501_CONTR_ACTIVE);
+}
+
 static int ltr501_probe(struct i2c_client *client,
 			  const struct i2c_device_id *id)
 {

@@ -355,7 +362,6 @@ static int ltr501_probe(struct i2c_client *client,
 		return ret;
 	if ((ret >> 4) != 0x8)
 		return -ENODEV;
-
 	indio_dev->dev.parent = &client->dev;
 	indio_dev->info = &ltr501_info;
 	indio_dev->channels = ltr501_channels;

@@ -370,7 +376,7 @@ static int ltr501_probe(struct i2c_client *client,
 	ret = iio_triggered_buffer_setup(indio_dev, NULL,
 		ltr501_trigger_handler, NULL);
 	if (ret)
-		return ret;
+		goto powerdown_on_error;
 
 	ret = iio_device_register(indio_dev);
 	if (ret)

@@ -380,16 +386,11 @@ static int ltr501_probe(struct i2c_client *client,
 
 error_unreg_buffer:
 	iio_triggered_buffer_cleanup(indio_dev);
+powerdown_on_error:
+	ltr501_powerdown(data);
 	return ret;
 }
 
-static int ltr501_powerdown(struct ltr501_data *data)
-{
-	return ltr501_write_contr(data->client,
-		data->als_contr & ~LTR501_CONTR_ACTIVE,
-		data->ps_contr & ~LTR501_CONTR_ACTIVE);
-}
-
 static int ltr501_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
Signature · 1 line
1.9.1
#3 lore raw
In reply to Cristina Opriceana
Quoted 5 lines · Cristina Opriceana

This patchset places drivers on standby when an error occurs.

I know these don't belong to the staging area, but I need a review before sending them.

Quoted 7 lines

Cristina Opriceana (2):
iio: magnetometer: mag3110: Place driver on standby on error
iio: light: ltr501: Powerdown device on error

 drivers/iio/light/ltr501.c         | 19 ++++++++++---------
 drivers/iio/magnetometer/mag3110.c | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)

This are outside staging please send them to linux-iio list.

Daniel.