Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2b0d2cf authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron
Browse files

staging: iio: tsl2583: remove redudant i2c call in taos_als_calibrate() 



taos_als_calibrate() queries the control register to determine if the
unit is powered on and has the ADC enabled. It then queries the same
register a second time to determine if the ADC reading is valid. This
patch removes the redundant i2c_smbus_read_byte_data() call.

Verified that the driver still functions correctly using a TSL2581
hooked up to a Raspberry Pi 2.

Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 0561155f

drivers/staging/iio/light/tsl2583.c

+1 −12
Original line number Diff line number Diff line
@@ -338,18 +338,7 @@ static int taos_als_calibrate(struct iio_dev *indio_dev) 
		dev_err(&chip->client->dev,

			"taos_als_calibrate failed: device not powered on with ADC enabled\n");

		return -EINVAL;

	}



	ret = i2c_smbus_read_byte_data(chip->client,

				       TSL258X_CMD_REG | TSL258X_CNTRL);

	if (ret < 0) {

		dev_err(&chip->client->dev,

			"%s failed to read from the CNTRL register\n",

			__func__);

		return ret;

	}



	if ((ret & TSL258X_STA_ADC_VALID) != TSL258X_STA_ADC_VALID) {

	} else if ((ret & TSL258X_STA_ADC_VALID) != TSL258X_STA_ADC_VALID) {

		dev_err(&chip->client->dev,

			"taos_als_calibrate failed: STATUS - ADC not valid.\n");

		return -ENODATA;