Skip to contentSkip to conversation

iio: tsl2772: remove unused prox_diode_mask variable

PATCH In review Tom Rix 4 participants 4 messages Mar 27, 2023 – Apr 1, 2023 IIO

lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 iio: tsl2772: remove unused prox_diode_mask variable

clang with W=1 reports
drivers/iio/light/tsl2772.c:576:24: error: variable
'prox_diode_mask' set but not used [-Werror,-Wunused-but-set-variable]

        int i, ret, num_leds, prox_diode_mask;
                              ^

This variable is not used so remove it.

---
 drivers/iio/light/tsl2772.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/iio/light/tsl2772.c +2 -7
index ad50baa0202c..c090405c2358 100644
@@ -573,7 +573,7 @@ static int tsl2772_read_prox_led_current(struct tsl2772_chip *chip)
 static int tsl2772_read_prox_diodes(struct tsl2772_chip *chip)
 {
 	struct device *dev = &chip->client->dev;
-	int i, ret, num_leds, prox_diode_mask;
+	int i, ret, num_leds;
 	u32 leds[TSL2772_MAX_PROX_LEDS];
 
 	ret = device_property_count_u32(dev, "amstaos,proximity-diodes");
@@ -590,13 +590,8 @@ static int tsl2772_read_prox_diodes(struct tsl2772_chip *chip)
 		return ret;
 	}
 
-	prox_diode_mask = 0;
 	for (i = 0; i < num_leds; i++) {
-		if (leds[i] == 0)
-			prox_diode_mask |= TSL2772_DIODE0;
-		else if (leds[i] == 1)
-			prox_diode_mask |= TSL2772_DIODE1;
-		else {
+		if (leds[i] > 1) {
 			dev_err(dev, "Invalid value %d in amstaos,proximity-diodes.\n", leds[i]);
 			return -EINVAL;
 		}
Signature · 1 line
2.27.0
#1 lore raw
Quoted 6 lines · Tom Rix

clang with W=1 reports
drivers/iio/light/tsl2772.c:576:24: error: variable
'prox_diode_mask' set but not used [-Werror,-Wunused-but-set-variable]

        int i, ret, num_leds, prox_diode_mask;
                              ^

This variable is not used so remove it.

While from the compilation point of view this is a correct fix, I think we need to hear from the author (or interested stakeholders) about this feature. Perhaps it should be enabled / fixed differently.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#2 lore raw
Quoted 8 lines · On Mon, 27 Mar 2023 16:07:48 +0300 Andy Shevchenko…
Quoted 6 lines · Tom Rix

clang with W=1 reports
drivers/iio/light/tsl2772.c:576:24: error: variable
'prox_diode_mask' set but not used [-Werror,-Wunused-but-set-variable]

        int i, ret, num_leds, prox_diode_mask;
                              ^

This variable is not used so remove it.

Quoted 4 lines

While from the compilation point of view this is a correct fix, I think we need to hear from the author (or interested stakeholders) about this feature. Perhaps it should be enabled / fixed differently.

Superficially it looks like this value should have been stored to chip->settings.prox_diode

+CC people who might know...

Jonathan

#3 lore raw
Quoted 16 lines · Jonathan Cameron
Quoted 8 lines · On Mon, 27 Mar 2023 16:07:48 +0300 Andy Shevchenko…
Quoted 6 lines · Tom Rix

clang with W=1 reports
drivers/iio/light/tsl2772.c:576:24: error: variable
'prox_diode_mask' set but not used [-Werror,-Wunused-but-set-variable]

        int i, ret, num_leds, prox_diode_mask;
                              ^

This variable is not used so remove it.

Quoted 4 lines

While from the compilation point of view this is a correct fix, I think we need to hear from the author (or interested stakeholders) about this feature. Perhaps it should be enabled / fixed differently.

Quoted 4 lines

Superficially it looks like this value should have been stored to chip->settings.prox_diode

+CC people who might know...

Jonathan is correct about the proper fix and is this is my mistake. We should just need to add this to the bottom of that function:

   chip->settings.prox_diode = prox_diode_mask;

Tom: I can fix this up next week, unless I hear from you otherwise that you'll do it.

Brian