stk3310 fixes and cleanup

The stk3310 driver makes use of regmap_i2c, so this dependency needs to be reflected in Kconfig.

Signed-off-by Hartmut Knaack <[email protected]>

---
 drivers/iio/light/Kconfig | 1 +
 1 file changed, 1 insertion(+)

drivers/iio/light/Kconfig +1 -0

index 730fa80..9c8b423 100644
@@ -212,6 +212,7 @@ config LTR501
 config STK3310
 	tristate "STK3310 ALS and proximity sensor"
 	depends on I2C
+	select REGMAP_I2C
 	help
 	 Say yes here to get support for the Sensortek STK3310 ambient light
 	 and proximity sensor. The STK3311 model is also supported by this

-----Original Message-----
From: Hartmut Knaack [mailto:[email protected]]
Sent: Saturday, July 4, 2015 6:57 PM
To: [email protected]
Cc: Jonathan Cameron; Lars-Peter Clausen; Peter Meerwald; Breana, Tiberiu A
Subject: [PATCH 2/5] iio:light:stk3310: make endianness independent of host

Data is stored in the device in be16 format. Make use of be16_to_cpu and cpu_to_be16 to have correct endianness on any host architecture.

Signed-off-by Hartmut Knaack <[email protected]>

---
 drivers/iio/light/stk3310.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/iio/light/stk3310.c index renamed from drivers/iio/light/stk3310.c +0 -0

c1a2182..c52c730 100644

drivers/iio/light/stk3310.c +2 -2

@@ -200,7 +200,7 @@ static int stk3310_read_event(struct iio_dev
 *indio_dev,
 			      int *val, int *val2)
 {
 	u8 reg;
-	u16 buf;
+	__be16 buf;
 	int ret;
 	struct stk3310_data *data = iio_priv(indio_dev);

@@ -222,7 +222,7 @@ static int stk3310_read_event(struct iio_dev
 *indio_dev,
 		dev_err(&data->client->dev, "register read failed\n");
 		return ret;
 	}
-	*val = swab16(buf);
+	*val = be16_to_cpu(buf);
 
 	return IIO_VAL_INT;

}

drivers/iio/light/stk3310.c +1 -1

@@ -235,7 +235,7 @@ static int stk3310_write_event(struct iio_dev
 *indio_dev,
 			       int val, int val2)
 {
 	u8 reg;
-	u16 buf;
+	__be16 buf;
 	int ret;
 	unsigned int index;

struct stk3310_data *data = iio_priv(indio_dev); @@ -252,7 +252,7
@@ static int stk3310_write_event(struct iio_dev *indio_dev,

drivers/iio/light/stk3310.c +1 -1

 	else
 		return -EINVAL;
 
-	buf = swab16(val);
+	buf = cpu_to_be16(val);
 	ret = regmap_bulk_write(data->regmap, reg, &buf, 2);
 	if (ret < 0)
 		dev_err(&client->dev, "failed to set PS threshold!\n"); @@ -

301,7 +301,7 @@ static int stk3310_read_raw(struct iio_dev *indio_dev,

drivers/iio/light/stk3310.c +1 -1

 			    int *val, int *val2, long mask)
 {
 	u8 reg;
-	u16 buf;
+	__be16 buf;
 	int ret;
 	unsigned int index;
 	struct stk3310_data *data = iio_priv(indio_dev); @@ -322,7 +322,7

@@ static int stk3310_read_raw(struct iio_dev *indio_dev,

drivers/iio/light/stk3310.c +1 -2

 			mutex_unlock(&data->lock);
 			return ret;
 		}
-		*val = swab16(buf);
+		*val = be16_to_cpu(buf);
 		mutex_unlock(&data->lock);
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_INT_TIME:
--

2.3.6

Check for the following error cases:
* lower boundary for val in _write_event
* return value of regmap_(field_)read
* possible values for chan->type
* return value of stk3310_gpio_probe

Also add an error-cleanup path in _probe to handle failure in iio_device_register and devm_request_threaded_irq.

Signed-off-by Hartmut Knaack <[email protected]>

---
 drivers/iio/light/stk3310.c | 60 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 14 deletions(-)

drivers/iio/light/stk3310.c +37 -14

index c52c730..3650c0c 100644
@@ -241,8 +241,11 @@ static int stk3310_write_event(struct iio_dev *indio_dev,
 	struct stk3310_data *data = iio_priv(indio_dev);
 	struct i2c_client *client = data->client;
 
-	regmap_field_read(data->reg_ps_gain, &index);
-	if (val > stk3310_ps_max[index])
+	ret = regmap_field_read(data->reg_ps_gain, &index);
+	if (ret < 0)
+		return ret;
+
+	if (val < 0 || val > stk3310_ps_max[index])
 		return -EINVAL;
 
 	if (dir == IIO_EV_DIR_RISING)

@@ -266,9 +269,12 @@ static int stk3310_read_event_config(struct iio_dev *indio_dev,
 				     enum iio_event_direction dir)
 {
 	unsigned int event_val;
+	int ret;
 	struct stk3310_data *data = iio_priv(indio_dev);
 
-	regmap_field_read(data->reg_int_ps, &event_val);
+	ret = regmap_field_read(data->reg_int_ps, &event_val);
+	if (ret < 0)
+		return ret;
 
 	return event_val;
 }

@@ -307,14 +313,16 @@ static int stk3310_read_raw(struct iio_dev *indio_dev,
 	struct stk3310_data *data = iio_priv(indio_dev);
 	struct i2c_client *client = data->client;
 
+	if (chan->type != IIO_LIGHT && chan->type != IIO_PROXIMITY)
+		return -EINVAL;
+
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
 		if (chan->type == IIO_LIGHT)
 			reg = STK3310_REG_ALS_DATA_MSB;
-		else if (chan->type == IIO_PROXIMITY)
-			reg = STK3310_REG_PS_DATA_MSB;
 		else
-			return -EINVAL;
+			reg = STK3310_REG_PS_DATA_MSB;
+
 		mutex_lock(&data->lock);
 		ret = regmap_bulk_read(data->regmap, reg, &buf, 2);
 		if (ret < 0) {

@@ -327,17 +335,23 @@ static int stk3310_read_raw(struct iio_dev *indio_dev,
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_INT_TIME:
 		if (chan->type == IIO_LIGHT)
-			regmap_field_read(data->reg_als_it, &index);
+			ret = regmap_field_read(data->reg_als_it, &index);
 		else
-			regmap_field_read(data->reg_ps_it, &index);
+			ret = regmap_field_read(data->reg_ps_it, &index);
+		if (ret < 0)
+			return ret;
+
 		*val = stk3310_it_table[index][0];
 		*val2 = stk3310_it_table[index][1];
 		return IIO_VAL_INT_PLUS_MICRO;
 	case IIO_CHAN_INFO_SCALE:
 		if (chan->type == IIO_LIGHT)
-			regmap_field_read(data->reg_als_gain, &index);
+			ret = regmap_field_read(data->reg_als_gain, &index);
 		else
-			regmap_field_read(data->reg_ps_gain, &index);
+			ret = regmap_field_read(data->reg_ps_gain, &index);
+		if (ret < 0)
+			return ret;
+
 		*val = stk3310_scale_table[index][0];
 		*val2 = stk3310_scale_table[index][1];
 		return IIO_VAL_INT_PLUS_MICRO;

@@ -354,6 +368,9 @@ static int stk3310_write_raw(struct iio_dev *indio_dev,
 	int index;
 	struct stk3310_data *data = iio_priv(indio_dev);
 
+	if (chan->type != IIO_LIGHT && chan->type != IIO_PROXIMITY)
+		return -EINVAL;
+
 	switch (mask) {
 	case IIO_CHAN_INFO_INT_TIME:
 		index = stk3310_get_index(stk3310_it_table,

@@ -435,7 +452,10 @@ static int stk3310_init(struct iio_dev *indio_dev)
 	struct stk3310_data *data = iio_priv(indio_dev);
 	struct i2c_client *client = data->client;
 
-	regmap_read(data->regmap, STK3310_REG_ID, &chipid);
+	ret = regmap_read(data->regmap, STK3310_REG_ID, &chipid);
+	if (ret < 0)
+		return ret;
+
 	if (chipid != STK3310_CHIP_ID_VAL &&
 	    chipid != STK3311_CHIP_ID_VAL) {
 		dev_err(&client->dev, "invalid chip id: 0x%x\n", chipid);

@@ -611,11 +631,14 @@ static int stk3310_probe(struct i2c_client *client,
 	ret = iio_device_register(indio_dev);
 	if (ret < 0) {
 		dev_err(&client->dev, "device_register failed\n");
-		stk3310_set_state(data, STK3310_STATE_STANDBY);
+		goto err_standby;
 	}
 
-	if (client->irq <= 0)
+	if (client->irq <= 0) {
 		client->irq = stk3310_gpio_probe(client);
+		if (client->irq < 0)
+			goto err_unregister;
+	}
 
 	if (client->irq >= 0) {
 		ret = devm_request_threaded_irq(&client->dev, client->irq,

@@ -624,11 +647,20 @@ static int stk3310_probe(struct i2c_client *client,
 						IRQF_TRIGGER_FALLING |
 						IRQF_ONESHOT,
 						STK3310_EVENT, indio_dev);
-		if (ret < 0)
+		if (ret < 0) {

drivers/iio/light/stk3310.c +3 -0

+err_standby:
+	stk3310_set_state(data, STK3310_STATE_STANDBY);
+
 	return ret;
 }
 

-----Original Message-----
From: Jonathan Cameron [mailto:[email protected]]
Sent: Sunday, July 5, 2015 2:25 PM
To: Hartmut Knaack; [email protected]
Cc: Lars-Peter Clausen; Peter Meerwald; Breana, Tiberiu A
Subject: Re: [PATCH 3/5] iio:light:stk3310: add more error handling

Quoted 10 lines · Hartmut Knaack

Check for the following error cases:
* lower boundary for val in _write_event
* return value of regmap_(field_)read
* possible values for chan->type
* return value of stk3310_gpio_probe

Also add an error-cleanup path in _probe to handle failure in iio_device_register and devm_request_threaded_irq.

Signed-off-by Hartmut Knaack <[email protected]>

I'm not sure how I missed this before, but the probe order below is rather unusual. I'm a little bothered by the theoretical race condition between the exposure of the device to userspace
(device_register) and the configuration of it's irq later.

It is probably possible (in theory) to enable an event before the irq is registered and get the event to fire, resulting in an unhandled interrupt.

I'm going to hold back on the rest of this set until Tiberiu has had a chance to comment on them anyway.

Jonathan

drivers/iio/light/stk3310.c static int stk3310_write_event(struct iio_dev

Quoted 10 lines

---
 drivers/iio/light/stk3310.c | 60
++++++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 14 deletions(-)

drivers/iio/light/stk3310.c +0 -0

index c52c730..3650c0c 100644
@@ -241,8 +241,11 @@ static int stk3310_write_event(struct iio_dev

*indio_dev,

drivers/iio/light/stk3310.c static int stk3310_read_event_config(struct

Quoted 14 lines

drivers/iio/light/stk3310.c +5 -2

 	struct stk3310_data *data = iio_priv(indio_dev);
 	struct i2c_client *client = data->client;
 
-	regmap_field_read(data->reg_ps_gain, &index);
-	if (val > stk3310_ps_max[index])
+	ret = regmap_field_read(data->reg_ps_gain, &index);
+	if (ret < 0)
+		return ret;
+
+	if (val < 0 || val > stk3310_ps_max[index])
 		return -EINVAL;
 
 	if (dir == IIO_EV_DIR_RISING)

@@ -266,9 +269,12 @@ static int stk3310_read_event_config(struct

iio_dev *indio_dev,

drivers/iio/light/stk3310.c static int stk3310_read_raw(struct iio_dev

Quoted 13 lines

drivers/iio/light/stk3310.c +4 -1

 				     enum iio_event_direction dir)  {
 	unsigned int event_val;
+	int ret;
 	struct stk3310_data *data = iio_priv(indio_dev);
 
-	regmap_field_read(data->reg_int_ps, &event_val);
+	ret = regmap_field_read(data->reg_int_ps, &event_val);
+	if (ret < 0)
+		return ret;
 
 	return event_val;
 }

@@ -307,14 +313,16 @@ static int stk3310_read_raw(struct iio_dev

*indio_dev,

drivers/iio/light/stk3310.c static int stk3310_read_raw(struct iio_dev

Quoted 20 lines

drivers/iio/light/stk3310.c +5 -3

 	struct stk3310_data *data = iio_priv(indio_dev);
 	struct i2c_client *client = data->client;
 
+	if (chan->type != IIO_LIGHT && chan->type != IIO_PROXIMITY)
+		return -EINVAL;
+
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
 		if (chan->type == IIO_LIGHT)
 			reg = STK3310_REG_ALS_DATA_MSB;
-		else if (chan->type == IIO_PROXIMITY)
-			reg = STK3310_REG_PS_DATA_MSB;
 		else
-			return -EINVAL;
+			reg = STK3310_REG_PS_DATA_MSB;
+
 		mutex_lock(&data->lock);
 		ret = regmap_bulk_read(data->regmap, reg, &buf, 2);
 		if (ret < 0) {

@@ -327,17 +335,23 @@ static int stk3310_read_raw(struct iio_dev

*indio_dev,

Quoted 8 lines

drivers/iio/light/stk3310.c +2 -2

 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_INT_TIME:
 		if (chan->type == IIO_LIGHT)
-			regmap_field_read(data->reg_als_it, &index);
+			ret = regmap_field_read(data->reg_als_it, &index);
 		else
-			regmap_field_read(data->reg_ps_it, &index);
+			ret = regmap_field_read(data->reg_ps_it, &index);

drivers/iio/light/stk3310.c static int stk3310_read_raw(struct iio_dev *indio_dev,

Quoted 10 lines

drivers/iio/light/stk3310.c +4 -1

+		if (ret < 0)
+			return ret;
+
 		*val = stk3310_it_table[index][0];
 		*val2 = stk3310_it_table[index][1];
 		return IIO_VAL_INT_PLUS_MICRO;
 	case IIO_CHAN_INFO_SCALE:
 		if (chan->type == IIO_LIGHT)
-			regmap_field_read(data->reg_als_gain, &index);
+			ret = regmap_field_read(data->reg_als_gain,

&index);

drivers/iio/light/stk3310.c static int stk3310_read_raw(struct iio_dev *indio_dev,

Quoted 3 lines

drivers/iio/light/stk3310.c +1 -1

 		else
-			regmap_field_read(data->reg_ps_gain, &index);
+			ret = regmap_field_read(data->reg_ps_gain,

&index);

drivers/iio/light/stk3310.c static int stk3310_write_raw(struct iio_dev

Quoted 7 lines

drivers/iio/light/stk3310.c +3 -0

+		if (ret < 0)
+			return ret;
+
 		*val = stk3310_scale_table[index][0];
 		*val2 = stk3310_scale_table[index][1];
 		return IIO_VAL_INT_PLUS_MICRO;

@@ -354,6 +368,9 @@ static int stk3310_write_raw(struct iio_dev

*indio_dev,

Quoted 29 lines

drivers/iio/light/stk3310.c +8 -3

 	int index;
 	struct stk3310_data *data = iio_priv(indio_dev);
 
+	if (chan->type != IIO_LIGHT && chan->type != IIO_PROXIMITY)
+		return -EINVAL;
+
 	switch (mask) {
 	case IIO_CHAN_INFO_INT_TIME:
 		index = stk3310_get_index(stk3310_it_table,

@@ -435,7 +452,10 @@ static int stk3310_init(struct iio_dev *indio_dev)
 	struct stk3310_data *data = iio_priv(indio_dev);
 	struct i2c_client *client = data->client;
 
-	regmap_read(data->regmap, STK3310_REG_ID, &chipid);
+	ret = regmap_read(data->regmap, STK3310_REG_ID, &chipid);
+	if (ret < 0)
+		return ret;
+
 	if (chipid != STK3310_CHIP_ID_VAL &&
 	    chipid != STK3311_CHIP_ID_VAL) {
 		dev_err(&client->dev, "invalid chip id: 0x%x\n", chipid); @@
-611,11 +631,14 @@ static int stk3310_probe(struct i2c_client *client,
 	ret = iio_device_register(indio_dev);
 	if (ret < 0) {
 		dev_err(&client->dev, "device_register failed\n");
-		stk3310_set_state(data, STK3310_STATE_STANDBY);
+		goto err_standby;
 	}

drivers/iio/light/stk3310.c static int stk3310_probe(struct i2c_client *client, · line 637

Quoted 2 lines

drivers/iio/light/stk3310.c +1 -1

-	if (client->irq <= 0)
+	if (client->irq <= 0) {

drivers/iio/light/stk3310.c static int stk3310_probe(struct i2c_client *client, · line 644

Quoted 7 lines

drivers/iio/light/stk3310.c +3 -0

 		client->irq = stk3310_gpio_probe(client);
+		if (client->irq < 0)
+			goto err_unregister;
+	}
 
 	if (client->irq >= 0) {
 		ret = devm_request_threaded_irq(&client->dev, client->irq,

@@

Quoted 12 lines

-624,11 +647,20 @@ static int stk3310_probe(struct i2c_client *client,

drivers/iio/light/stk3310.c +3 -1

 						IRQF_TRIGGER_FALLING |
 						IRQF_ONESHOT,
 						STK3310_EVENT, indio_dev);
-		if (ret < 0)
+		if (ret < 0) {
 			dev_err(&client->dev, "request irq %d failed\n",
 					client->irq);
+			goto err_unregister;
+		}
 	}

drivers/iio/light/stk3310.c static int stk3310_probe(struct i2c_client *client, · line 660

Quoted 4 lines

drivers/iio/light/stk3310.c +4 -0

+	return 0;
+
+err_unregister:
+	iio_device_unregister(indio_dev);

This made me nervous, as there is a very good reason the register is almost always last in the probe function. It exposes the interfaces to userspace (and in kernel for that matter). Everything must be ready before it is called. Here we could (though unlikely) get an unhandled interrupt as the handler has not been registered as yet.

Quoted 7 lines

drivers/iio/light/stk3310.c +3 -0

+err_standby:
+	stk3310_set_state(data, STK3310_STATE_STANDBY);
+
 	return ret;
 }

Quoted 23 lines

-----Original Message-----
From: Jonathan Cameron [mailto:[email protected]]
Sent: Sunday, July 5, 2015 2:25 PM
To: Hartmut Knaack; [email protected]
Cc: Lars-Peter Clausen; Peter Meerwald; Breana, Tiberiu A
Subject: Re: [PATCH 3/5] iio:light:stk3310: add more error handling

Quoted 10 lines · Hartmut Knaack

Check for the following error cases:
* lower boundary for val in _write_event
* return value of regmap_(field_)read
* possible values for chan->type
* return value of stk3310_gpio_probe

Also add an error-cleanup path in _probe to handle failure in iio_device_register and devm_request_threaded_irq.

Signed-off-by Hartmut Knaack <[email protected]>

I'm not sure how I missed this before, but the probe order below is rather unusual. I'm a little bothered by the theoretical race condition between the exposure of the device to userspace
(device_register) and the configuration of it's irq later.

Quoted 7 lines

It is probably possible (in theory) to enable an event before the irq is registered and get the event to fire, resulting in an unhandled interrupt.

I'm going to hold back on the rest of this set until Tiberiu has had a chance to comment on them anyway.

Jonathan

Agreed, the probe order needs to be changed. Some comments below.

Tiberiu

Quoted 8 lines

Quoted 8 lines

-611,11 +631,14 @@ static int stk3310_probe(struct i2c_client *client,

drivers/iio/light/stk3310.c +1 -1

 	ret = iio_device_register(indio_dev);
 	if (ret < 0) {
 		dev_err(&client->dev, "device_register failed\n");
-		stk3310_set_state(data, STK3310_STATE_STANDBY);
+		goto err_standby;
 	}

Quoted 2 lines

drivers/iio/light/stk3310.c static int stk3310_probe(struct i2c_client *client, · line 637

Quoted 2 lines

drivers/iio/light/stk3310.c +1 -1

-	if (client->irq <= 0)
+	if (client->irq <= 0) {

Sort of unrelated to your patch, but I think this should be (client->irq < 0) I would appreciate it if you would include it in your next patch set :)

Quoted 20 lines

drivers/iio/light/stk3310.c static int stk3310_probe(struct i2c_client *client, · line 644

Quoted 7 lines

drivers/iio/light/stk3310.c +3 -0

 		client->irq = stk3310_gpio_probe(client);
+		if (client->irq < 0)
+			goto err_unregister;
+	}
 
 	if (client->irq >= 0) {
 		ret = devm_request_threaded_irq(&client->dev, client->irq,

@@

Quoted 12 lines

-624,11 +647,20 @@ static int stk3310_probe(struct i2c_client *client,

drivers/iio/light/stk3310.c +3 -1

 						IRQF_TRIGGER_FALLING |
 						IRQF_ONESHOT,
 						STK3310_EVENT, indio_dev);
-		if (ret < 0)
+		if (ret < 0) {
 			dev_err(&client->dev, "request irq %d failed\n",
 					client->irq);
+			goto err_unregister;
+		}
 	}

Quoted 9 lines

drivers/iio/light/stk3310.c static int stk3310_probe(struct i2c_client *client, · line 660

Quoted 4 lines

drivers/iio/light/stk3310.c +4 -0

+	return 0;
+
+err_unregister:
+	iio_device_unregister(indio_dev);

This made me nervous, as there is a very good reason the register is almost always last in the probe function. It exposes the interfaces to userspace (and in kernel for that matter). Everything must be ready before it is called. Here we could (though unlikely) get an unhandled interrupt as the handler has not been registered as yet.

The iio_device_register block should indeed be moved to the end of _probe.

Quoted 7 lines

drivers/iio/light/stk3310.c static int stk3310_probe(struct i2c_client *client, · line 665

Quoted 7 lines

drivers/iio/light/stk3310.c +3 -0

+err_standby:
+	stk3310_set_state(data, STK3310_STATE_STANDBY);
+
 	return ret;
 }

--
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

-----Original Message-----
From: Hartmut Knaack [mailto:[email protected]]
Sent: Saturday, July 4, 2015 6:57 PM
To: [email protected]
Cc: Jonathan Cameron; Lars-Peter Clausen; Peter Meerwald; Breana, Tiberiu A
Subject: [PATCH 4/5] iio:light:stk3310: use correct names and type for st=

=20
Indicate the bit number of predefined states, make use of these names and change the state type in _resume to u8 to avoid type casting. =20

Signed-off-by Hartmut Knaack <[email protected]>

3650c0c..be715c7 100644

drivers/iio/light/stk3310.c +0 -0

@@ -35,8 +35,8 @@
 #define STK3310_REG_ID				0x3E
 #define STK3310_MAX_REG				0x80

=20

drivers/iio/light/stk3310.c +2 -2

-#define STK3310_STATE_EN_PS			0x01
-#define STK3310_STATE_EN_ALS			0x02
+#define STK3310_STATE_EN_PS			BIT(0)
+#define STK3310_STATE_EN_ALS			BIT(1)
 #define STK3310_STATE_STANDBY			0x00

=20
#define STK3310_CHIP_ID_VAL 0x13

drivers/iio/light/stk3310.c +2 -2

@@ -436,8 +436,8 @@ static int stk3310_set_state(struct stk3310_data
 *data, u8 state)
 		dev_err(&client->dev, "failed to change sensor state\n");
 	} else if (state !=3D STK3310_STATE_STANDBY) {
 		/* Don't reset the 'enabled' flags if we're going in standby */
-		data->ps_enabled  =3D !!(state & 0x01);
-		data->als_enabled =3D !!(state & 0x02);
+		data->ps_enabled  =3D !!(state & STK3310_STATE_EN_PS);
+		data->als_enabled =3D !!(state & STK3310_STATE_EN_ALS);
 	}
 	mutex_unlock(&data->lock);

=20

drivers/iio/light/stk3310.c +0 -0

@@ -684,7 +684,7 @@ static int stk3310_suspend(struct device *dev)

=20
static int stk3310_resume(struct device *dev) {

drivers/iio/light/stk3310.c +1 -1

-	int state =3D 0;
+	u8 state =3D 0;
 	struct stk3310_data *data;

=20
data =3D iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
--
2.3.6

-----Original Message-----
From: Hartmut Knaack [mailto:[email protected]]
Sent: Saturday, July 4, 2015 6:57 PM
To: [email protected]
Cc: Jonathan Cameron; Lars-Peter Clausen; Peter Meerwald; Breana, Tiberiu A
Subject: [PATCH 5/5] iio:light:stk3310: adjust indentation =20
Adjust some indentation issues as spotted by checkpatch.pl --strict =20

Signed-off-by Hartmut Knaack <[email protected]>

be715c7..2760f67 100644

drivers/iio/light/stk3310.c +1 -1

@@ -385,7 +385,7 @@ static int stk3310_write_raw(struct iio_dev
 *indio_dev,
 			ret =3D regmap_field_write(data->reg_ps_it, index);
 		if (ret < 0)
 			dev_err(&data->client->dev,
-					"sensor configuration failed\n");
+				"sensor configuration failed\n");
 		mutex_unlock(&data->lock);
 		return ret;

=20

drivers/iio/light/stk3310.c +1 -1

@@ -402,7 +402,7 @@ static int stk3310_write_raw(struct iio_dev
 *indio_dev,
 			ret =3D regmap_field_write(data->reg_ps_gain, index);
 		if (ret < 0)
 			dev_err(&data->client->dev,
-					"sensor configuration failed\n");
+				"sensor configuration failed\n");
 		mutex_unlock(&data->lock);
 		return ret;

drivers/iio/light/stk3310.c +1 -2

 	}

@@ -649,7 +649,7 @@ static int stk3310_probe(struct i2c_client *client,
 						STK3310_EVENT, indio_dev);
 		if (ret < 0) {
 			dev_err(&client->dev, "request irq %d failed\n",
-					client->irq);
+				client->irq);
 			goto err_unregister;
 		}
 	}
--

2.3.6