|
@@ -336,13 +336,12 @@ static int tsl2x7x_write_control_reg(struct tsl2X7X_chip *chip, u8 data)
|
|
|
*/
|
|
|
static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
|
|
|
{
|
|
|
- u32 lux; /* raw lux calculated from device data */
|
|
|
- u64 lux64;
|
|
|
- u32 ratio;
|
|
|
- u8 buf[4];
|
|
|
- struct tsl2x7x_lux *p;
|
|
|
struct tsl2X7X_chip *chip = iio_priv(indio_dev);
|
|
|
+ struct tsl2x7x_lux *p;
|
|
|
+ u32 lux, ratio;
|
|
|
int i, ret;
|
|
|
+ u64 lux64;
|
|
|
+ u8 buf[4];
|
|
|
|
|
|
mutex_lock(&chip->als_mutex);
|
|
|
|
|
@@ -589,13 +588,9 @@ static int tsl2x7x_als_calibrate(struct iio_dev *indio_dev)
|
|
|
|
|
|
static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
|
|
|
{
|
|
|
- int i;
|
|
|
- int ret = 0;
|
|
|
- u8 *dev_reg;
|
|
|
- int als_count;
|
|
|
- int als_time;
|
|
|
struct tsl2X7X_chip *chip = iio_priv(indio_dev);
|
|
|
- u8 reg_val = 0;
|
|
|
+ int ret, i, als_count, als_time;
|
|
|
+ u8 *dev_reg, reg_val;
|
|
|
|
|
|
/* Non calculated parameters */
|
|
|
chip->tsl2x7x_config[TSL2X7X_PRX_TIME] = chip->settings.prx_time;
|
|
@@ -1121,8 +1116,8 @@ static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
|
|
|
int *val2,
|
|
|
long mask)
|
|
|
{
|
|
|
- int ret = -EINVAL;
|
|
|
struct tsl2X7X_chip *chip = iio_priv(indio_dev);
|
|
|
+ int ret = -EINVAL;
|
|
|
|
|
|
switch (mask) {
|
|
|
case IIO_CHAN_INFO_PROCESSED:
|
|
@@ -1583,9 +1578,9 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
|
|
|
static int tsl2x7x_probe(struct i2c_client *clientp,
|
|
|
const struct i2c_device_id *id)
|
|
|
{
|
|
|
- int ret;
|
|
|
struct iio_dev *indio_dev;
|
|
|
struct tsl2X7X_chip *chip;
|
|
|
+ int ret;
|
|
|
|
|
|
indio_dev = devm_iio_device_alloc(&clientp->dev, sizeof(*chip));
|
|
|
if (!indio_dev)
|