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

staging: iio: tsl2583: remove unnecessary chip status checks in suspend/resume 



The device probing and the suspend/resume code checks a flag internal to
the driver that determines whether or not the chip is in a working
state. These checks are not needed. This patch removes the unnecessary
checks. It will do no harm to the hardware if the chip is
reinitialized if it is already powered on.

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

drivers/staging/iio/light/tsl2583.c

+3 −13
Original line number Diff line number Diff line
@@ -412,13 +412,6 @@ static int tsl2583_chip_init_and_power_on(struct iio_dev *indio_dev) 
	struct tsl2583_chip *chip = iio_priv(indio_dev);

	int ret;



	/* and make sure we're not already on */

	if (chip->taos_chip_status == TSL258X_CHIP_WORKING) {

		/* if forcing a register update - turn off, then on */

		dev_info(&chip->client->dev, "device is already enabled\n");

		return -EINVAL;

	}



	/* Power on the device; ADC off. */

	ret = tsl2583_set_power_state(chip, TSL258X_CNTL_PWR_ON);

	if (ret < 0)
@@ -841,10 +834,8 @@ static int __maybe_unused taos_suspend(struct device *dev) 


	mutex_lock(&chip->als_mutex);



	if (chip->taos_chip_status == TSL258X_CHIP_WORKING) {

	ret = tsl2583_set_power_state(chip, TSL258X_CNTL_PWR_OFF);

	chip->taos_chip_status = TSL258X_CHIP_SUSPENDED;

	}



	mutex_unlock(&chip->als_mutex);

	return ret;
@@ -858,7 +849,6 @@ static int __maybe_unused taos_resume(struct device *dev) 


	mutex_lock(&chip->als_mutex);



	if (chip->taos_chip_status == TSL258X_CHIP_SUSPENDED)

	ret = tsl2583_chip_init_and_power_on(indio_dev);



	mutex_unlock(&chip->als_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE