Commit 9a20795c authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio: accel: bmi088: Balance runtime pm + use pm_runtime_resume_and_get() 



The call to pm_runtime_put_noidle() in remove() is not balanced by a get so
drop it.

Using pm_runtime_resume_and_get() allows for simple introduction of
error handling to allow for runtime resume failing.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Mike Looijmans <mike.looijmans@topic.nl>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/20210509113354.660190-13-jic23@kernel.org
parent f3017272

drivers/iio/accel/bmi088-accel-core.c

+20 −6
Original line number Diff line number Diff line
@@ -285,11 +285,17 @@ static int bmi088_accel_read_raw(struct iio_dev *indio_dev, 
	case IIO_CHAN_INFO_RAW:

		switch (chan->type) {

		case IIO_TEMP:

			pm_runtime_get_sync(dev);

			ret = pm_runtime_resume_and_get(dev);

			if (ret)

				return ret;



			ret = bmi088_accel_get_temp(data, val);

			goto out_read_raw_pm_put;

		case IIO_ACCEL:

			pm_runtime_get_sync(dev);

			ret = pm_runtime_resume_and_get(dev);

			if (ret)

				return ret;



			ret = iio_device_claim_direct_mode(indio_dev);

			if (ret)

				goto out_read_raw_pm_put;
@@ -319,7 +325,10 @@ static int bmi088_accel_read_raw(struct iio_dev *indio_dev, 
			*val = BMI088_ACCEL_TEMP_UNIT;

			return IIO_VAL_INT;

		case IIO_ACCEL:

			pm_runtime_get_sync(dev);

			ret = pm_runtime_resume_and_get(dev);

			if (ret)

				return ret;



			ret = regmap_read(data->regmap,

					  BMI088_ACCEL_REG_ACC_RANGE, val);

			if (ret)
@@ -334,7 +343,10 @@ static int bmi088_accel_read_raw(struct iio_dev *indio_dev, 
			return -EINVAL;

		}

	case IIO_CHAN_INFO_SAMP_FREQ:

		pm_runtime_get_sync(dev);

		ret = pm_runtime_resume_and_get(dev);

		if (ret)

			return ret;



		ret = bmi088_accel_get_sample_freq(data, val, val2);

		goto out_read_raw_pm_put;

	default:
@@ -376,7 +388,10 @@ static int bmi088_accel_write_raw(struct iio_dev *indio_dev, 


	switch (mask) {

	case IIO_CHAN_INFO_SAMP_FREQ:

		pm_runtime_get_sync(dev);

		ret = pm_runtime_resume_and_get(dev);

		if (ret)

			return ret;



		ret = bmi088_accel_set_sample_freq(data, val);

		pm_runtime_mark_last_busy(dev);

		pm_runtime_put_autosuspend(dev);
@@ -530,7 +545,6 @@ int bmi088_accel_core_remove(struct device *dev) 


	pm_runtime_disable(dev);

	pm_runtime_set_suspended(dev);

	pm_runtime_put_noidle(dev);

	bmi088_accel_power_down(data);



	return 0;