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

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

staging: iio: isl29028: remove nested if statements 



There are two callers to the function isl29028_set_als_ir_mode() and
both instances use a nested if statement to only change the chip state
if it is not in the proper mode. This patch moves this check into the
isl29028_set_als_ir_mode() function to remove the nested if
statements.

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

drivers/staging/iio/light/isl29028.c

+14 −16
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ static int isl29028_set_als_ir_mode(struct isl29028_chip *chip, 
{

	int ret = 0;



	if (chip->als_ir_mode == mode)

		return 0;



	switch (mode) {

	case ISL29028_MODE_ALS:

		ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
@@ -160,6 +163,9 @@ static int isl29028_set_als_ir_mode(struct isl29028_chip *chip, 


	/* Need to wait for conversion time if ALS/IR mode enabled */

	mdelay(ISL29028_CONV_TIME_MS);



	chip->als_ir_mode = mode;



	return 0;

}
@@ -223,15 +229,11 @@ static int isl29028_als_get(struct isl29028_chip *chip, int *als_data) 
	int ret;

	int als_ir_data;



	if (chip->als_ir_mode != ISL29028_MODE_ALS) {

	ret = isl29028_set_als_ir_mode(chip, ISL29028_MODE_ALS);

	if (ret < 0) {

			dev_err(dev,

				"Error in enabling ALS mode err %d\n", ret);

		dev_err(dev, "Error in enabling ALS mode err %d\n", ret);

		return ret;

	}

		chip->als_ir_mode = ISL29028_MODE_ALS;

	}



	ret = isl29028_read_als_ir(chip, &als_ir_data);

	if (ret < 0)
@@ -256,15 +258,11 @@ static int isl29028_ir_get(struct isl29028_chip *chip, int *ir_data) 
	struct device *dev = regmap_get_device(chip->regmap);

	int ret;



	if (chip->als_ir_mode != ISL29028_MODE_IR) {

	ret = isl29028_set_als_ir_mode(chip, ISL29028_MODE_IR);

	if (ret < 0) {

			dev_err(dev,

				"Error in enabling IR mode err %d\n", ret);

		dev_err(dev, "Error in enabling IR mode err %d\n", ret);

		return ret;

	}

		chip->als_ir_mode = ISL29028_MODE_IR;

	}

	return isl29028_read_als_ir(chip, ir_data);

}