cm3323 fixes and cleanups

When setting the bits for integration time, the appropriate bitmask needs to be cleared first.

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

---
 drivers/iio/light/cm3323.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

index 869033e..a1d4905 100644

Fix the typo in the module description for the CM3323.

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

Reviewed-by Daniel Baluta <[email protected]>

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

drivers/iio/light/Kconfig +0 -0

index e6198b7..554f8ee 100644

cm3323_get_it_bits() returns a valid error code, so pass it up in cm3323_read_raw().

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

Reviewed-by Daniel Baluta <[email protected]>

---
 drivers/iio/light/cm3323.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

index a1d4905..feb4dbc 100644

In cm3323_read_raw() i is used as return variable for the integration time index. The also existing return variable ret however is unused in this case, although appropriate. Replace i with ret and drop it.

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

Reviewed-by Daniel Baluta <[email protected]>

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

drivers/iio/light/cm3323.c +3 -4

index 9cd7d2a..2c49ec2 100644
@@ -153,7 +153,7 @@ static int cm3323_read_raw(struct iio_dev *indio_dev,
 			   struct iio_chan_spec const *chan, int *val,
 			   int *val2, long mask)
 {
-	int i, ret;
+	int ret;
 	struct cm3323_data *data = iio_priv(indio_dev);
 
 	switch (mask) {

@@ -170,14 +170,14 @@ static int cm3323_read_raw(struct iio_dev *indio_dev,
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_INT_TIME:
 		mutex_lock(&data->mutex);
-		i = cm3323_get_it_bits(data);
-		if (i < 0) {
+		ret = cm3323_get_it_bits(data);
+		if (ret < 0) {
 			mutex_unlock(&data->mutex);
-			return i;

Use GENMASK to define the integration time bitmask.

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

---
 drivers/iio/light/cm3323.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

index 2c49ec2..1fc9f78 100644

Add some empty lines to visually separate logical structure blocks, as after if-blocks or before regular returns.

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

Reviewed-by Daniel Baluta <[email protected]>

---
 drivers/iio/light/cm3323.c | 5 +++++
 1 file changed, 5 insertions(+)

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

index 1fc9f78..0831f06 100644
@@ -131,9 +131,11 @@ static int cm3323_set_it_bits(struct cm3323_data *data, int val, int val2)
 				return ret;
 
 			data->reg_conf = reg_conf;
+
 			return 0;
 		}
 	}
+
 	return -EINVAL;
 }
 

@@ -146,6 +148,7 @@ static int cm3323_get_it_bits(struct cm3323_data *data)
 
 	if (bits >= ARRAY_SIZE(cm3323_int_time))
 		return -EINVAL;
+
 	return bits;
 }
 

@@ -241,11 +244,13 @@ static int cm3323_probe(struct i2c_client *client,
 		dev_err(&client->dev, "cm3323 chip init failed\n");
 		return ret;
 	}

Some small fixes and cleanups.

Changes in V2:
- apply the integration time bitmask right
- fix order of GENMASK arguments as pointed out by Peter Meerwald

Hartmut Knaack (7):
iio:light:cm3323: clear bitmask before set iio:light:Kconfig: fix typo in description iio:light:cm3323: pass up error value iio:light:cm3323: drop barely used variable iio:light:cm3323: replace unneeded variable iio:light:cm3323: make use of GENMASK iio:light:cm3323: add empty lines for code structure

 drivers/iio/light/Kconfig  |  2 +-
 drivers/iio/light/cm3323.c | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

Quoted 15 lines · Hartmut Knaack

Some small fixes and cleanups.

Changes in V2:
- apply the integration time bitmask right
- fix order of GENMASK arguments as pointed out by Peter Meerwald

Hartmut Knaack (7):
iio:light:cm3323: clear bitmask before set iio:light:Kconfig: fix typo in description iio:light:cm3323: pass up error value iio:light:cm3323: drop barely used variable iio:light:cm3323: replace unneeded variable iio:light:cm3323: make use of GENMASK iio:light:cm3323: add empty lines for code structure

Quoted 4 lines

 drivers/iio/light/Kconfig  |  2 +-
 drivers/iio/light/cm3323.c | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

This whole series looks good to me, but I'll let them sit for Daniel to have a look as it's his driver.

Path 1 is clearly a bug fix, but the others can go the slow route.
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in